diff --git a/build/autogen.sh b/build/autogen.sh
index b40645995630d7deb5c7360bfd2093a0d9954b0a..5d77897f135fb43580f9eeb21046f6d9d8b61ad9 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -83,7 +83,7 @@ if [ -d kernel_patches ] ; then
     REQUIRED_DIRS="build"
     CONFIGURE_DIRS=""
 else
-    REQUIRED_DIRS="build lnet lustre"
+    REQUIRED_DIRS="build libcfs lnet lustre"
     OPTIONAL_DIRS="snmp portals"
     CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 fi
diff --git a/build/buildcvs b/build/buildcvs
index 0df9ab6e71752133c6ebac7d5c438267a43b20fa..bf2a6b1ed57500df1fbd72de9e4df0714a688da5 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -7,7 +7,7 @@ snmptag="HEAD"
 ldiskfstag="HEAD"
 ldiskfstag_head="b1_8_iam"
 lustreiokittag="HEAD"
-libcfstag=""
+libcfstag="b1_x"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -268,8 +268,6 @@ cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
 hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
-if [ -n $libcfstag ]; then
-    cvs_cmd libcfs libcfs "$libcfstag"
-fi
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build