diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index f272ed8be9c68d5bb3c40e8a9b054812baa01d0e..f9b2904cfca4d1f96c38943bfccab01e3ddbbd6f 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -51,9 +51,7 @@ endif # !LINUX25
 modules: $(DEP) all-sources
 	$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)		     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude 		     \
-        $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) 	     \
-        -include include/linux/autoconf.h' 			     \
+        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX
diff --git a/build/buildcvs b/build/buildcvs
index 3f8653005cea1f28cb3b6b5717277e8d97c16664..99b7c8ab4d058af24014dcd204fe611a9a2592d8 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -166,6 +166,7 @@ case "$lustretag" in
     # uOSS
     b_hd_dmu)
         lnettag="b_uoss"
+        ldiskfstag="b1_8_iam"
         ;;
     
     # v1.0-v1.3, v1.4.0-v1.4.2