diff --git a/BaseBuild/Basesys/gmp b/BaseBuild/Basesys/gmp
index 1bfcd0e..f8bd53e 100644
--- a/BaseBuild/Basesys/gmp
+++ b/BaseBuild/Basesys/gmp
@@ -126,12 +126,13 @@ mk() {
 }
 
 postmk() {
-	mv -v $TMPROOT/usr/include/gmp{,-64}.h
 	mkdir -p $TMPROOT/usr/share
 	mv $TMPROOT/usr/info $TMPROOT/usr/share/info
 	cd ../gmp*
 	rm -r ../build-gmp
-	cat > /usr/include/gmp.h << "EOF"
+	if [ $MK64BIT == "true" ]; then
+		mv -v $TMPROOT/usr/include/gmp{,-64}.h
+		cat > /usr/include/gmp.h << "EOF"
 /* gmp.h - Stub Header */
 #ifndef __STUB__GMP_H__
 #define __STUB__GMP_H__
@@ -146,4 +147,5 @@ postmk() {
 
 #endif /* __STUB__GMP_H__ */
 EOF
+	fi
 }
diff --git a/BaseBuild/Basesys/libtool b/BaseBuild/Basesys/libtool
index c9e9aaa..3b710fa 100644
--- a/BaseBuild/Basesys/libtool
+++ b/BaseBuild/Basesys/libtool
@@ -99,8 +99,10 @@ mk() {
 		    --cache-file=config.cache
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	mv $TMPROOT/usr/bin/libtool{,-64}
-	ln -s multiarch_wrapper /usr/bin/libtool
+	if [ $MK64BIT == "true" ]; then
+		mv $TMPROOT/usr/bin/libtool{,-64}
+		ln -s multiarch_wrapper /usr/bin/libtool
+	fi
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/ncurses b/BaseBuild/Basesys/ncurses
index 11389b5..9701e3f 100644
--- a/BaseBuild/Basesys/ncurses
+++ b/BaseBuild/Basesys/ncurses
@@ -115,10 +115,12 @@ mk() {
 	make
 	make install
 	make DESTDIR=$TMPROOT install
-	mv -v /usr/bin/ncursesw5-config{,-64}
-	ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
-	mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
-	ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
+	if [ "$MK64BIT" == "true" ]; then
+		mv -v /usr/bin/ncursesw5-config{,-64}
+		ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
+		mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
+		ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
+	fi
 }
 
 postmk() {