diff --git a/SysBuild/guibased/pango b/SysBuild/guibased/pango
index 9805e8a..bec1e8d 100644
--- a/SysBuild/guibased/pango
+++ b/SysBuild/guibased/pango
@@ -115,12 +115,14 @@ mk() {
 		 pango/Makefile.am \
 		 pango/Makefile.in; do
 		 mv $i.orig $i
-		 sed -i "s/BUILDENV/64/" $i
+		 if [ "$MK64BIT" == "true" ]; then
+		 	sed -i "s/BUILDENV/64/" $i
+		 fi
 	done
 	CC="gcc $BUILDOPTIONS -I/usr/X11R7/include/freetype2 \
 	                      -L/usr/X11R7/$LIBDIR \
 			      -Wl,--rpath \
-			      -Wl,/usr/lib64" \
+			      -Wl,/usr/$LIBDIR" \
 	CXX="g++ $BUILDOPTIONS -I/usr/X11R7/include/freetype2" \
 	USE_ARCH=$UARCH \
 	./configure --build=$TARGET \