diff --git a/srcpkgs/nss/nss-devel.template b/srcpkgs/nss/nss-devel.template
index 8c80a9d0703..4799d0d28f2 100644
--- a/srcpkgs/nss/nss-devel.template
+++ b/srcpkgs/nss/nss-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run nspr-devel
 Add_dependency run nss
 
 do_install()
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index b5ee15b41d0..99c1fc0b322 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -16,8 +16,10 @@ long_desc="
 subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run zlib
-Add_dependency full nspr
-Add_dependency full sqlite
+Add_dependency run nspr
+Add_dependency build zlib-devel
+Add_dependency build nspr-devel
+Add_dependency build sqlite-devel
 
 do_install()
 {
@@ -33,8 +35,10 @@ do_install()
 			NSPR_LIB_DIR=/usr/lib ${_use64} || return 1
 	done
 	
-	install -m644 mozilla/dist/public/nss/*.h ${DESTDIR}/usr/include/nss
-	install -m755 mozilla/dist/*.OBJ/lib/*.so ${DESTDIR}/usr/lib
+	install -m644 mozilla/dist/public/nss/*.h \
+		${DESTDIR}/usr/include/nss || return 1
+	install -m755 mozilla/dist/*.OBJ/lib/*.so \
+		${DESTDIR}/usr/lib || return 1
 
 	( echo "Name: NSS"; \
 	  echo "Description: Mozilla Network Security Services"; \
@@ -42,5 +46,7 @@ do_install()
 	  echo "Cflags: -I/usr/include/nss"; \
 	  echo "Libs: -L/usr/lib -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lpthread -ldl"; \
 	) >${DESTDIR}/usr/lib/pkgconfig/nss.pc
-	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/nss.pc
+	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/nss.pc || return 1
+	cd ${DESTDIR}/usr/lib/pkgconfig && ln -s nss.pc mozilla-nss.pc \
+		|| return 1
 }