diff --git a/configure-libafs.in b/configure-libafs.in
index 42b58d7740..c8c476edf5 100644
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,5 +1,8 @@
-AC_INIT(src/libafs/Makefile.common.in)
-AM_INIT_AUTOMAKE(openafs-libafs,1.5.74.1)
+AC_PRERQ([2.60])
+AC_INIT([OpenAFS], [1.5.74.1])
+AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in)
+AM_INIT_AUTOMAKE
+
 AC_CONFIG_HEADER(src/config/afsconfig.h)
 MACOS_VERSION=1.5.74f1
 LINUX_PKGVER=1.5.74.1
diff --git a/configure.in b/configure.in
index b7545ff22b..b6269e0fb3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
 AC_PREREQ([2.60])
-AC_INIT(src/config/stds.h)
-AM_INIT_AUTOMAKE(openafs,1.5.74.1)
+AC_INIT([OpenAFS], [1.5.74.1])
+AC_CONFIG_SRCDIR([src/config/stds.h])
+AM_INIT_AUTOMAKE
+
 AC_CONFIG_HEADER(src/config/afsconfig.h)
 MACOS_VERSION=1.5.74f1
 LINUX_PKGVER=1.5.74.1