diff --git a/Makefile-libafs.in b/Makefile-libafs.in
index 8ef8abaf34..6cdfcd8a88 100644
--- a/Makefile-libafs.in
+++ b/Makefile-libafs.in
@@ -1,3 +1,5 @@
+# -*- makefile -*-
+#
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
 # 
@@ -5,12 +7,19 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+include src/config/Makefile.config
+
 all: 
+	cd src && cd config && $(MAKE)
+	src/config/config src/libafs/MakefileProto \
+		src/libafs/Makefile ${SYS_NAME}
 	cd src && cd libafs && $(MAKE)
 
 clean:
+	cd src && cd config && $(MAKE) clean
 	cd src && cd libafs && $(MAKE) clean
 
 distclean: clean
-	rm -f Makefile src/config/Makefile.config src/config/Makefile.version \
-		src/libafs/Makefile.common src/libafs/Makefile
+	rm -f Makefile src/config/Makefile src/config/Makefile.config \
+		src/config/Makefile.version src/libafs/Makefile.common \
+		src/libafs/Makefile
diff --git a/Makefile.in b/Makefile.in
index 758e5d7bd8..e0b0b7993b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -436,14 +436,12 @@ ${DEST}/bin/dedebug: dedebug
 #
 # libafs build targets
 #
-libafs_setup: config export
-	src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
-
-libafs: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
+libafs: config export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
 		libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall
+	src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
 	+${COMPILE_PART1} libafs ${COMPILE_PART2}
 
-libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
+libafs_tree: export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
 		libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall
 	${TOP_SRCDIR}/config/make_libafs_tree.pl \
 		-sn $(SYS_NAME) \
diff --git a/configure-libafs.in b/configure-libafs.in
index f1c0693203..42b58d7740 100644
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -15,8 +15,10 @@ OPENAFS_CONFIGURE_COMMON
 
 AC_OUTPUT(             \
 Makefile               \
+src/config/Makefile    \
 src/config/Makefile.config \
-src/config/Makefile.version:src/config/Makefile.version-NOCML.in \
+src/config/Makefile.version-CML \
+src/config/Makefile.version-NOCML \
 src/libafs/Makefile.common \
-src/libafs/Makefile \
+src/libafs/MakefileProto \
 )
diff --git a/src/config/libafsdep b/src/config/libafsdep
index 68e39bb467..ce19006f01 100644
--- a/src/config/libafsdep
+++ b/src/config/libafsdep
@@ -1,3 +1,9 @@
+Makefile.in
 Makefile.config.in
+Makefile.version-CML.in
 Makefile.version-NOCML.in
 afsconfig.h.in
+config.c
+mc.c
+mkvers.c
+*.h
diff --git a/src/config/make_libafs_tree.pl b/src/config/make_libafs_tree.pl
index f29d40f6d1..2ed60b96b8 100755
--- a/src/config/make_libafs_tree.pl
+++ b/src/config/make_libafs_tree.pl
@@ -65,11 +65,12 @@ finddepth(\&find_libafsdep, $projdir);
 #
 &copyit("$projdir/configure-libafs", "$treedir/configure");
 &copyit("$projdir/Makefile-libafs.in", "$treedir/Makefile.in");
+&copyit("$projdir/src/libafs/MakefileProto.$ostype.in",
+        "$treedir/src/libafs/MakefileProto.in");
 
-system("$objdir/src/config/config", 
-	"$projdir/src/libafs/MakefileProto.$ostype.in", 
-	"$treedir/src/libafs/Makefile.in",
-	$sysname);
+# We need to regenerate this to support building amd64 kernels from a
+# libafs_tree built on i386.
+unlink("$treedir/include/afs/param.h");
 
 #
 # Subs
@@ -108,7 +109,6 @@ sub process_libafsdep
 		# do some simple substitution in dep file
 		#
 		$file =~ s/MKAFS_OSTYPE/$ostype/ge;
-		$file =~ s/AFS_SYSNAME/$sysname/ge;
 
 		next if ( $file eq "" );