diff --git a/talimatname/genel/nss/nss-softokn.pc.in b/talimatname/genel/nss/nss-softokn.pc.in
new file mode 100644
index 000000000..4242ffae5
--- /dev/null
+++ b/talimatname/genel/nss/nss-softokn.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-SOFTOKN
+Description: Network Security Services Softoken PKCS #11 Module
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
+Cflags: -I${includedir}/private
diff --git a/talimatname/genel/nss/nss-util.pc.in b/talimatname/genel/nss/nss-util.pc.in
new file mode 100644
index 000000000..7ed9914c5
--- /dev/null
+++ b/talimatname/genel/nss/nss-util.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-UTIL
+Description: Network Security Services Utility Library
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -L${libdir} -lnssutil3
+Cflags: -I${includedir}
diff --git a/talimatname/genel/nss/talimat b/talimatname/genel/nss/talimat
index ffb5bbde7..84920324d 100644
--- a/talimatname/genel/nss/talimat
+++ b/talimatname/genel/nss/talimat
@@ -4,10 +4,10 @@
 # Depends on: nspr sqlite 
 
 name=nss
-version=3.30.2
-release=2
+version=3.31
+release=1
 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_}_RTM/src/$name-$version.tar.gz \
-        nss-config.in nss.pc.in)
+        nss-config.in nss.pc.in nss-util.pc.in nss-softokn.pc.in)
 
 build() {
 	cd $name-$version/
@@ -28,15 +28,17 @@ build() {
 
 	make -j1 -C nss
 
-	install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
+	install -d $PKG/usr/{bin,lib/pkgconfig,include/nss/private}
 
 	cd dist/*.OBJ/bin
 	install -t "$PKG/usr/bin" *util shlibsign signtool signver ssltap
 	cd ../lib
 	install -t "$PKG/usr/lib" *.so
-	install -t "$PKG/usr/lib" -m644 libcrmf.a *.chk
+	install -t "$PKG/usr/lib" -m644 libcrmf.a libfreebl.a *.chk
 	cd ../../public/nss
 	install -t "$PKG/usr/include/nss" -m644 *.h
+	cd ../../private/nss
+	install -t "$PKG/usr/include/nss/private" -m644 blapi.h alghmac.h
 	install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
 
 	_version=$(printf "%i.%i.%i" ${version//./ })
@@ -45,15 +47,17 @@ build() {
 	NSS_LIBS=`$PKG/usr/bin/nss-config --libs`
 	NSS_CFLAGS=`$PKG/usr/bin/nss-config --cflags`
 	NSPR_VERSION=`pkg-config --modversion nspr`
-	sed $SRC/nss.pc.in \
-		-e "s,%libdir%,/usr/lib," \
-		-e "s,%prefix%,/usr," \
-		-e "s,%exec_prefix%,/usr/bin," \
-		-e "s,%includedir%,/usr/include/nss," \
-		-e "s,%NSS_VERSION%,$version," \
-		-e "s,%NSPR_VERSION%,$NSPR_VERSION," \
-		-e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \
-		-e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \
-	$PKG/usr/lib/pkgconfig/nss.pc
+	for module in nss nss-util nss-softokn; do
+		sed $SRC/$module.pc.in \
+			-e "s,%libdir%,/usr/lib," \
+			-e "s,%prefix%,/usr," \
+			-e "s,%exec_prefix%,/usr/bin," \
+			-e "s,%includedir%,/usr/include/nss," \
+			-e "s,%NSS_VERSION%,$version," \
+			-e "s,%NSPR_VERSION%,$NSPR_VERSION," \
+			-e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \
+			-e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \
+		$PKG/usr/lib/pkgconfig/$module.pc
+	done
 
 }