diff --git a/SysBuild/xserv/xorg-server b/SysBuild/xserv/xorg-server
index 7b9ae7b..ca23306 100644
--- a/SysBuild/xserv/xorg-server
+++ b/SysBuild/xserv/xorg-server
@@ -72,10 +72,26 @@
 SRCPATH=XServ/Server
 
 premk() {
-#	cd ..
-#	tar -jxvf $LFSSOURCE/$SRCPATH/MesaLib-*.tar.bz2
+	mkdir ../build-xorg-server
+	cd ../build-xorg-server
 	Mesa=`\ls -d $MAKEDIR/Mesa*`
-#	cd -
+}
+
+mk32() {
+	CC="gcc ${BUILDOPTIONS32}" \
+	CXX="g++ ${BUILDOPTIONS32}" \
+	USE_ARCH=$UARCH \
+	../xorg-server*/configure --host=$TARGET32 \
+	                          --localstatedir=/var \
+				  --infodir=/usr/share/info \
+				  --mandir=/usr/share/man \
+				  --prefix=/usr/X11R7 \
+				  --with-mesa-source=$Mesa
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	cd ../xorg-server*
+	rm -r ../build-xorg-server
+	cd ../build-xorg-server
 }
 
 mk() {
@@ -92,17 +108,11 @@ mk() {
 		    $ADDOPTIONS \
 		    --prefix=/usr/X11R7 \
 		    --with-mesa-source=$Mesa
-	#sed -e "s/= -lrt/= -lrt -lGL/" hw/vfb/Makefile >/tmp/Makefile
-	#mv /tmp/Makefile hw/vfb/Makefile
-	#sed -e "s/= -lrt/= -lrt -lGL/" hw/xnest/Makefile >/tmp/Makefile
-	#mv /tmp/Makefile hw/xnest/Makefile
-	#sed -e "s/= -lrt/= -lrt -lGL/" hw/xprint/Makefile >/tmp/Makefile
-	#mv /tmp/Makefile hw/xprint/Makefile
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
 	GetSVN Viitor_X11 $TMPROOT
-	#rm -r $Mesa
+	rm -r $Mesa
 }