diff --git a/SysBuild/security/nspr b/SysBuild/security/nspr
index 18c5409..51fba53 100644
--- a/SysBuild/security/nspr
+++ b/SysBuild/security/nspr
@@ -81,6 +81,12 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=$UARCH \
 	./configure --prefix=/usr/X11R7 \
+	            --libdir=/usr/lib/nspr \
+		    --infodir=/usr/share/info \
+		    --mandir=/usr/share/man \
+		    --disable-debug \
+		    --disable-ipv6 \
+		    --enable-system-sqlite \
 	            --enable-strip \
 		    --with-pthreads \
 		    --with-dist-prefix=$TMPROOT
@@ -89,10 +95,35 @@ mk32() {
 	cp -rpvL lib usr/X11R7
 	rm -r {lib,include,bin}
 	cd -
-	sed -e "s/lib64/lib/" config/nspr-config >\
-	                      $TMPROOT/usr/X11R7/bin/nspr-config-32
+	sed -e "s%/usr/lib/nspr%/usr/X11R7/lib/nspr%" config/nspr-config >\
+	       $TMPROOT/usr/X11R7/bin/nspr-config-32
 	chmod 755 $TMPROOT/usr/X11R7/bin/nspr-config-32
 	make distclean
+	mkdir -p $TMPROOT/usr/X11R7/lib/pkgconfig
+	cat > $TMPROOT/usr/X11R7/lib/pkgconfig/nspr.pc << "EOF"
+prefix=/usr/X11R7
+exec_prefix=/usr/X11R7/bin
+libdir=/usr/X11R7/lib/nspr
+includedir=/usr/X11R7/include/nspr
+	      
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: %NSPR_VERSION%
+Libs: %FULL_NSPR_LIBS%
+Cflags: %FULL_NSPR_CFLAGS%
+EOF
+		    
+	NSPR_LIBS=$($TMPROOT/usr/X11R7/bin/nspr-config-32 --libs)
+	NSPR_CFLAGS=$($TMPROOT/usr/X11R7/bin/nspr-config-32 --cflags)
+	NSPR_VERSION=$($TMPROOT/usr/X11R7/bin/nspr-config-32 --version)
+		      
+	sed -i -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
+		-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
+		-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," \
+		$TMPROOT/usr/X11R7/lib/pkgconfig/nspr.pc
+			      
+	chmod 644 $TMPROOT/usr/X11R7/lib/pkgconfig/nspr.pc
+	ln -sf nspr.pc $TMPROOT/usr/X11R7/lib/pkgconfig/mozilla-nspr.pc
 }
 
 mk() {
@@ -103,6 +134,12 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --prefix=/usr/X11R7 \
+	            --libdir=/usr/lib/nspr \
+		    --infodir=/usr/share/info \
+		    --mandir=/usr/share/man \
+		    --disable-debug \
+		    --disable-ipv6 \
+		    --enable-system-sqlite \
 	            --enable-strip \
 		    $ADDOPTIONS \
 		    --with-pthreads \
@@ -116,14 +153,39 @@ mk() {
 	cp -rpvL include usr/X11R7
 	rm -r {lib*,include,bin}
 	cd -
+	sed -e "s%/usr/lib/nspr%/usr/X11R7/$LIBDIR/nspr%" config/nspr-config >\
+	       $TMPROOT/usr/X11R7/bin/nspr-config
+	chmod 755 $TMPROOT/usr/X11R7/bin/nspr-config
 	if [ "$MK64BIT" == "true" ]; then
-		sed -e "s/lib$/lib64/" config/nspr-config >\
-	                              $TMPROOT/usr/X11R7/bin/nspr-config-64
-		chmod 755 $TMPROOT/usr/X11R7/bin/nspr-config-64
+		mv $TMPROOT/usr/X11R7/bin/nspr-config{,-64}
 		ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/nspr-config
-	else
-		cp config/nspr-config $TMPROOT/usr/X11R7/bin
 	fi
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/pkgconfig
+	cat > $TMPROOT/usr/X11R7/$LIBDIR/pkgconfig/nspr.pc << "EOF"
+prefix=/usr/X11R7
+exec_prefix=/usr/X11R7/bin
+libdir=/usr/X11R7/$LIBDIR/nspr
+includedir=/usr/X11R7/include/nspr
+	      
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: %NSPR_VERSION%
+Libs: %FULL_NSPR_LIBS%
+Cflags: %FULL_NSPR_CFLAGS%
+EOF
+		    
+	NSPR_LIBS=$($TMPROOT/usr/X11R7/bin/nspr-config --libs)
+	NSPR_CFLAGS=$($TMPROOT/usr/X11R7/bin/nspr-config --cflags)
+	NSPR_VERSION=$($TMPROOT/usr/X11R7/bin/nspr-config --version)
+		      
+	sed -i -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
+		-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
+		-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," \
+		-e "s%\$LIBDIR%$LIBDIR%" \
+		$TMPROOT/usr/X11R7/$LIBDIR/pkgconfig/nspr.pc
+			      
+	chmod 644 $TMPROOT/usr/X11R7/$LIBDIR/pkgconfig/nspr.pc
+	ln -sf nspr.pc $TMPROOT/usr/X11R7/$LIBDIR/pkgconfig/mozilla-nspr.pc
 }
 
 postmk() {