diff --git a/SysBuild/guibased/pango b/SysBuild/guibased/pango
index bec1e8d..566ca1f 100644
--- a/SysBuild/guibased/pango
+++ b/SysBuild/guibased/pango
@@ -93,14 +93,37 @@ mk32() {
 		 pango/Makefile.in; do
 		 sed -i "s/BUILDENV/32/" $i
 	done
-	CC="gcc $BUILDOPTIONS32 -I/usr/X11R7/include/freetype2" \
-	CXX="g++ $BUILDOPTIONS32 -I/usr/X11R7/include/freetype2" \
+	CC="gcc $BUILDOPTIONS32 -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include" \
+	CXX="g++ $BUILDOPTIONS32 -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include" \
 	LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \
 	USE_ARCH=$UARCH \
 	./configure --build=$TARGET32 \
-        	    --prefix=/usr/X11R7 &&
+        	    --prefix=/usr/X11R7 \
+		    --sysconfdir=/etc \
+		    --with-dynamic-modules=yes &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	sed -i "s/#am__append_3/am__append_3/" modules/arabic/Makefile
+	sed -i "s/#am__append_5/am__append_5/" modules/arabic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/basic/Makefile
+	sed -i "s/#am__append_6/am__append_6/" modules/basic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/hangul/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/hebrew/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/indic/Makefile
+	sed -i "s/#am__append_5/am__append_5/" modules/indic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/khmer/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/syriac/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/thai/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/tibetan/Makefile
+	cd modules
+	make -j 4
+	for i in `find . -name "*.a"`; do
+		GenDynLib32 `pwd`/$i 1.6.0
+	done
+	find . -name "*.la" -type f -exec cp {} $TMPROOT/usr/X11R7/lib/pango/1.6.0/modules \;
+	find . -name "*.so*" -exec cp {} $TMPROOT/usr/X11R7/lib/pango/1.6.0/modules \;
+	find . -name "*.a" -exec cp {} $TMPROOT/usr/X11R7/lib/pango/1.6.0/modules \;
+	cd ..
 	make distclean
 	mv $TMPROOT/usr/X11R7/bin/pango-querymodules{,-32}
 }
@@ -120,16 +143,38 @@ mk() {
 		 fi
 	done
 	CC="gcc $BUILDOPTIONS -I/usr/X11R7/include/freetype2 \
-	                      -L/usr/X11R7/$LIBDIR \
-			      -Wl,--rpath \
-			      -Wl,/usr/$LIBDIR" \
-	CXX="g++ $BUILDOPTIONS -I/usr/X11R7/include/freetype2" \
+		              -I/usr/X11R7/include" \
+	CXX="g++ $BUILDOPTIONS -I/usr/X11R7/include/freetype2 -I/usr/X11R7/include" \
 	USE_ARCH=$UARCH \
+	LDFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
 	./configure --build=$TARGET \
 		    $ADDOPTIONS \
-        	    --prefix=/usr/X11R7 &&
+        	    --prefix=/usr/X11R7 \
+		    --sysconfdir=/etc \
+		    --with-dynamic-modules=yes &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	sed -i "s/#am__append_3/am__append_3/" modules/arabic/Makefile
+	sed -i "s/#am__append_5/am__append_5/" modules/arabic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/basic/Makefile
+	sed -i "s/#am__append_6/am__append_6/" modules/basic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/hangul/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/hebrew/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/indic/Makefile
+	sed -i "s/#am__append_5/am__append_5/" modules/indic/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/khmer/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/syriac/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/thai/Makefile
+	sed -i "s/#am__append_3/am__append_3/" modules/tibetan/Makefile
+	cd modules
+	make -j $NUMCPU
+	for i in `find . -name "*.a"`; do
+		GenDynLib `pwd`/$i 1.6.0
+	done
+	find . -name "*.la" -type f -exec cp {} $TMPROOT/usr/X11R7/$LIBDIR/pango/1.6.0/modules \;
+	find . -name "*.so*" -exec cp {} $TMPROOT/usr/X11R7/$LIBDIR/pango/1.6.0/modules \;
+	find . -name "*.a" -exec cp {} $TMPROOT/usr/X11R7/$LIBDIR/pango/1.6.0/modules \;
+	cd ..
 }
 
 postmk() {
@@ -140,4 +185,5 @@ postmk() {
 		mv $TMPROOT/usr/X11R7/bin/pango-querymodules{,-64}
 		ln -s ../../bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/pango-querymodules
 	fi
+	GetSVN Viitor_pango $TMPROOT
 }