diff --git a/security/nss/Makefile b/security/nss/Makefile
index 2bdd00cba1f..f8cb3030b06 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.9 2008/02/12 23:26:31 martynas Exp $
+# $OpenBSD: Makefile,v 1.10 2008/07/25 00:46:59 martynas Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		libraries to support development of security-enabled apps
 
-VERSION=		3.11.9
+VERSION=		3.12
 DISTNAME=		nss-${VERSION}
-SO_VERSION=		21.0
-.for _lib in freebl3 nss3 nssckbi smime3 softokn3 ssl3
+SO_VERSION=		22.0
+.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
 SHARED_LIBS+=		${_lib} ${SO_VERSION}
 .endfor
 CATEGORIES=		security
@@ -26,15 +26,17 @@ WANTLIB += c pthread z
 MASTER_SITES=		http://ftp.eu.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/ \
 			http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/
 
-LIB_DEPENDS=		nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr
+LIB_DEPENDS=		nspr4.>=20,plc4.>=20,plds4.>=20:nspr->=4.7:devel/nspr \
+			sqlite3.>=10.0:sqlite3->=3.5:databases/sqlite3
 
 MAKE_ENV=		BUILD_OPT=1 \
 			LOCALBASE="${LOCALBASE}" \
 			NSS_ENABLE_ECC=1 \
+			NSS_USE_SYSTEM_SQLITE=1 \
 			SO_VERSION="${SO_VERSION}" \
-			XCFLAGS="${CFLAGS}" \
-			NSPR_INCLUDE_DIR=${LOCALBASE}/include/nspr \
-			NSPR_LIB_DIR=${LOCALBASE}/lib
+			XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
+			NSPR_INCLUDE_DIR="${LOCALBASE}/include/nspr" \
+			NSPR_LIB_DIR="${LOCALBASE}/lib"
 
 USE_GMAKE=		Yes
 
diff --git a/security/nss/distinfo b/security/nss/distinfo
index fb656fee228..6ac75b2baea 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,5 +1,5 @@
-MD5 (nss-3.11.9.tar.gz) = XfVOhSK+vw+MjCLo8N8Y+g==
-RMD160 (nss-3.11.9.tar.gz) = 9g7KgSrOfcV0WaLdvOEsIwVUAGE=
-SHA1 (nss-3.11.9.tar.gz) = ltxTHU7VGNS0v0OTKJbKsnbW8+0=
-SHA256 (nss-3.11.9.tar.gz) = +lUYL2ddXBgOuSihep7slM0xcXK6SwcLYoxSIwuaUCg=
-SIZE (nss-3.11.9.tar.gz) = 3760535
+MD5 (nss-3.12.tar.gz) = kX9OBfOYK9f86u3hl/Dh1A==
+RMD160 (nss-3.12.tar.gz) = qE+foR6f2xwT9tm4BLbzfaxO4K8=
+SHA1 (nss-3.12.tar.gz) = a46DwJMc+tFhqumT00Roe2fzF6o=
+SHA256 (nss-3.12.tar.gz) = 0wp0cLgqc+1EJSWzZa+vAEJyBON3Ht/qsFdDrMqXEis=
+SIZE (nss-3.12.tar.gz) = 5163155
diff --git a/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk b/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk
index fa951c85a8d..6acbd6f6f71 100644
--- a/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk
+++ b/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.3 2007/08/01 21:16:10 kurt Exp $
---- mozilla/security/coreconf/OpenBSD.mk.orig	Sun May  6 04:08:36 2007
-+++ mozilla/security/coreconf/OpenBSD.mk	Fri Jul 20 08:35:24 2007
+$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.4 2008/07/25 00:47:00 martynas Exp $
+--- mozilla/security/coreconf/OpenBSD.mk.orig	Thu Nov 22 06:39:56 2007
++++ mozilla/security/coreconf/OpenBSD.mk	Sat Jul 19 22:45:35 2008
 @@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
  DSO_LDOPTS		+= -pthread
  endif
@@ -8,5 +8,14 @@ $OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.3 2007/08/01 21:16:10 k
 -DLL_SUFFIX		= so.1.0
 +DLL_SUFFIX		= so.${SO_VERSION}
  
- OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
+ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
  
+@@ -68,7 +68,7 @@ DSO_CFLAGS		= -fPIC -DPIC
+ DSO_LDOPTS		= -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ DSO_LDFLAGS		=
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+ 
+ USE_SYSTEM_ZLIB		= 1
+ ZLIB_LIBS		= -lz
diff --git a/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c b/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
index 133940fc610..e79b796ff4b 100644
--- a/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
+++ b/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
@@ -1,17 +1,7 @@
-$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.3 2008/02/12 23:26:31 martynas Exp $
---- mozilla/security/nss/lib/freebl/unix_rand.c.orig	Thu Jul 26 02:18:55 2007
-+++ mozilla/security/nss/lib/freebl/unix_rand.c	Wed Feb 13 01:23:57 2008
-@@ -866,7 +866,8 @@ safe_pclose(FILE *fp)
-     /* if the child hasn't exited, kill it -- we're done with its output */
-     while ((rv = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR)
- 	;
--    if (rv == 0 && kill(pid, SIGKILL) == 0) {
-+    if (rv == 0) {
-+	kill(pid, SIGKILL);
- 	while ((rv = waitpid(pid, &status, 0)) == -1 && errno == EINTR)
- 	    ;
-     }
-@@ -887,7 +888,6 @@ safe_pclose(FILE *fp)
+$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.4 2008/07/25 00:47:00 martynas Exp $
+--- mozilla/security/nss/lib/freebl/unix_rand.c.orig	Mon Dec  3 23:07:01 2007
++++ mozilla/security/nss/lib/freebl/unix_rand.c	Mon Apr  7 01:23:45 2008
+@@ -888,7 +888,6 @@ safe_pclose(FILE *fp)
  /* Fork netstat to collect its output by default. Do not unset this unless
   * another source of entropy is available
   */
diff --git a/security/nss/pkg/PFRAG.shared b/security/nss/pkg/PFRAG.shared
deleted file mode 100644
index c94f69801cf..00000000000
--- a/security/nss/pkg/PFRAG.shared
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/12/04 17:19:54 kurt Exp $
-@lib lib/libfreebl3.so.${LIBfreebl3_VERSION}
-@lib lib/libnss3.so.${LIBnss3_VERSION}
-@lib lib/libnssckbi.so.${LIBnssckbi_VERSION}
-@lib lib/libsmime3.so.${LIBsmime3_VERSION}
-@lib lib/libsoftokn3.so.${LIBsoftokn3_VERSION}
-@lib lib/libssl3.so.${LIBssl3_VERSION}
diff --git a/security/nss/pkg/PLIST b/security/nss/pkg/PLIST
index 698ccbd0811..d0e36498fe8 100644
--- a/security/nss/pkg/PLIST
+++ b/security/nss/pkg/PLIST
@@ -1,14 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/02/13 17:11:05 naddy Exp $
-%%SHARED%%
-bin/certutil
-bin/cmsutil
-bin/crlutil
-bin/modutil
+@comment $OpenBSD: PLIST,v 1.4 2008/07/25 00:47:00 martynas Exp $
+@bin bin/certutil
+@bin bin/cmsutil
+@bin bin/crlutil
+@bin bin/modutil
 bin/nss-config
-bin/pk12util
-bin/signtool
-bin/signver
-bin/ssltap
+@bin bin/pk12util
+@bin bin/signtool
+@bin bin/signver
+@bin bin/ssltap
 include/nss/
 include/nss/base64.h
 include/nss/blapit.h
@@ -99,8 +98,17 @@ include/nss/ssl.h
 include/nss/sslerr.h
 include/nss/sslproto.h
 include/nss/sslt.h
+include/nss/utilrename.h
 include/nss/watcomfx.h
 lib/libcrmf.a
 lib/libfreebl3.chk
+@lib lib/libfreebl3.so.${LIBfreebl3_VERSION}
+@lib lib/libnss3.so.${LIBnss3_VERSION}
+@lib lib/libnssckbi.so.${LIBnssckbi_VERSION}
+@lib lib/libnssdbm3.so.${LIBnssdbm3_VERSION}
+@lib lib/libnssutil3.so.${LIBnssutil3_VERSION}
+@lib lib/libsmime3.so.${LIBsmime3_VERSION}
 lib/libsoftokn3.chk
+@lib lib/libsoftokn3.so.${LIBsoftokn3_VERSION}
+@lib lib/libssl3.so.${LIBssl3_VERSION}
 lib/pkgconfig/nss.pc