diff --git a/SysBuild/xserv/xorg-cf-files b/SysBuild/xserv/xorg-cf-files
index ddeeccd..1f443fa 100644
--- a/SysBuild/xserv/xorg-cf-files
+++ b/SysBuild/xserv/xorg-cf-files
@@ -76,17 +76,31 @@ premk() {
 	echo "Nothing to do for premk()"
 }
 
-mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/X11R7/lib64"
-	fi
+mk32() {
 	./configure --host=$TARGET \
 		    --localstatedir=/var \
 		    --infodir=/usr/share/info \
 		    --mandir=/usr/share/man \
-		    $ADDOPTIONS \
+		    --libdir=/usr/X11R7/lib \
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make distclean
+	sed -i "s/\(XPLIBSRC = \)/#\1/" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
+	sed -i "s/\$(XPLIBSRC)//g" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
+	sed -i "s/\$(XPLIB)//g" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
+}
+
+mk() {
+	./configure --host=$TARGET \
+		    --localstatedir=/var \
+		    --infodir=/usr/share/info \
+		    --mandir=/usr/share/man \
+		    --libdir=/usr/X11R7/${LIBDIR} \
+		    --prefix=/usr/X11R7
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	sed -i "s/\(XPLIBSRC = \)/#\1/" $TMPROOT/usr/X11R7/${LIBDIR}/X11/config/X11.tmpl
+	sed -i "s/\$(XPLIBSRC)//g" $TMPROOT/usr/X11R7/lib/${LIBDIR}/config/X11.tmpl
+	sed -i "s/\$(XPLIB)//g" $TMPROOT/usr/X11R7/lib/${LIBDIR}/config/X11.tmpl
 }
 
 postmk() {