diff --git a/SysBuild/security/nss b/SysBuild/security/nss
index b8b86f0..04c71ed 100644
--- a/SysBuild/security/nss
+++ b/SysBuild/security/nss
@@ -72,13 +72,60 @@
 SRCPATH=Security/Lib
 
 premk() {
-	mkdir -p $TMPROOT/opt/mozilla/nss
+	cd mozilla/security/coreconf
+	mkdir -p $TMPROOT/usr/X11R7/{include,bin,lib}
+}
+
+mk32() {
+	BOPTS=$BUILDOPTIONS32 make
+	cd ../nss/lib/softoken
+	BOPTS=$BUILDOPTIONS32 make
+	cd ../freebl
+	BOPTS=$BUILDOPTIONS32 make
+	cd ../../
+	BOPTS=$BUILDOPTIONS32 make
+	cd lib/freebl
+	BOPTS=$BUILDOPTIONS32 make
+	cd ../../
+	BOPTS=$BUILDOPTIONS32 make
+	BOPTS=$BUILDOPTIONS32 make install
+	cd ../../dist/Linux*
+	cp -vpL bin/* $TMPROOT/usr/X11R7/bin
+	cp -vpL lib/* $TMPROOT/usr/X11R7/lib
+	cd ../../security/coreconf
+	make clean
+	cd ../nss
+	make clean
+	cd lib/softoken
+	make clean
+	cd ../freebl
+	make clean
+	cd ../../../coreconf
 }
 
 mk() {
-	cp -a *	$TMPROOT/opt/mozilla/nss
+	BOPTS=$BUILDOPTIONS make
+	cd ../nss/lib/softoken
+	BOPTS=$BUILDOPTIONS make
+	cd ../freebl
+	BOPTS=$BUILDOPTIONS make
+	cd ../../
+	BOPTS=$BUILDOPTIONS make
+	cd lib/freebl
+	BOPTS=$BUILDOPTIONS make
+	cd ../../
+	BOPTS=$BUILDOPTIONS make
+	BOPTS=$BUILDOPTIONS make install
+	cd ../../dist/Linux*
+	cp -vpL bin/* $TMPROOT/usr/X11R7/bin
+	if [ "$MK64BIT" == "true" ]; then
+		mkdir $TMPROOT/usr/X11R7/$LIBDIR
+	fi
+	cp -vpL lib/* $TMPROOT/usr/X11R7/$LIBDIR
+	cd ..
+	cp -rvpL public/nss $TMPROOT/usr/X11R7/include
 }
 
 postmk() {
-	GetSVN Viitor_nss $TMPROOT
+	echo "Nothing to do for postmk()"
 }