diff --git a/Makefile.in b/Makefile.in
index 7414005c42a..f8d57159708 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,7 +131,7 @@ endif
 DIRS		+= xpinstall
 
 ifdef MOZ_PSM
-DIRS		+= security security/manager
+DIRS		+= security/nss security/manager
 endif
 
 ifdef MOZ_EXTENSIONS
diff --git a/client.mk b/client.mk
index 2e340d244b5..0a2db689afd 100644
--- a/client.mk
+++ b/client.mk
@@ -218,7 +218,7 @@ NSS_CO_MODULE += \
 		mozilla/security/aclocal.m4 \
 		$(NULL)
 
-NSS_CO_TAG = NSS_AUTOCONF_BRANCH
+NSS_CO_TAG = NSS_CLIENT_BRANCH
 endif
 		
 NSS_CO_FLAGS := -P
diff --git a/configure b/configure
index fa4ab09c686..ebd9264bbc0 100755
--- a/configure
+++ b/configure
@@ -14013,6 +14013,9 @@ fi
 fi
 
 if test "$MOZ_PSM"; then
+    if test ! -d security; then
+        rm -rf security; mkdir security
+    fi
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --disable-cmd"
     
 if test "$no_recursion" != yes; then
@@ -14040,7 +14043,7 @@ if test "$no_recursion" != yes; then
     esac
   done
 
-  for ac_config_dir in security; do
+  for ac_config_dir in security/nss; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
diff --git a/configure.in b/configure.in
index ea9f7eabe6c..34acef1876d 100644
--- a/configure.in
+++ b/configure.in
@@ -4571,6 +4571,9 @@ if test "$MOZ_LDAP_XPCOM"; then
 fi
 
 if test "$MOZ_PSM"; then
+    if test ! -d security; then
+        rm -rf security; mkdir security
+    fi
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --disable-cmd"
-    AC_OUTPUT_SUBDIRS(security)
+    AC_OUTPUT_SUBDIRS(security/nss)
 fi