diff --git a/lfs/busybox b/lfs/busybox
index f4b101c06..7df7c6196 100644
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -90,6 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		cd $(DIR_APP) && sed -i -e 's/#define BB_RMMOD//' Config.h; \
 		cd $(DIR_APP) && sed -i -e 's/#define BB_MODPROBE//' Config.h; \
 	fi
+	cd $(DIR_APP) && sed -i -e 's/enum { NAME_SIZE = 100 };/enum { NAME_SIZE = 150 };/' tar.c; \
+	
 	cd $(DIR_APP) && make
 	-mkdir -p /install/initrd/bin
 	cd $(DIR_APP) && install -m 0755 busybox /install/initrd/bin
diff --git a/lfs/pwlib b/lfs/pwlib
index 93b1da63e..dfdbfbbf9 100644
--- a/lfs/pwlib
+++ b/lfs/pwlib
@@ -80,6 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	mv /usr/include/ldap.h /
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make both && make install
-	mv /ldap.h /usr/include
+	mv /ldap.h /usr/include	
+	cd $(DIR_APP) && make opt && make install
 	@$(POSTBUILD)