diff --git a/SysBuild/development/sip b/SysBuild/development/sip
index caa5453..2a6aed3 100644
--- a/SysBuild/development/sip
+++ b/SysBuild/development/sip
@@ -75,24 +75,30 @@ premk() {
 }
 
 mk32() {
-	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
+	CFLAGS="$BUILDOPTIONS32" \
+	CXXFLAGS="$BUILDOPTIONS32" \
 	USE_ARCH=32 \
 	python configure.py
-	make -j $NUMCPU
+	sed -i "s/\((LFLAGS)\)/\1 -m32/" sipgen/Makefile
+	sed -i "s/\((LFLAGS)\)/\1 -m32/" siplib/Makefile
+	make -j $NUMCPU \
+	     CFLAGS="$BUILDOPTIONS32 -pipe -w -I/usr/include/python2.6" \
+	     CXXFLAGS="$BUILDOPTIONS32 -pipe -w" \
+	     CPPFLAGS="$BUILDOPTIONS32 -DNDEBUG -I." \
+	     LDEMULATION=elf32_i386
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	make distclean
+	make clean
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
+	CFLAGS="$BUILDOPTIONS" \
+	CXXFLAGS="$BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	python configure.py
-	make -j $NUMCPU
+	make -j $NUMCPU \
+	     CFLAGS="$BUILDOPTIONS -pipe -w -I/usr/include/python2.6 -fPIC" \
+	     CXXFLAGS="$BUILDOPTIONS -pipe -w -fPIC" \
+	     CPPFLAGS="$BUILDOPTIONS -DNDEBUG -I. -fPIC" 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }