diff --git a/client.mk b/client.mk
index b245e2203a1..ef2c2b57bfd 100644
--- a/client.mk
+++ b/client.mk
@@ -90,7 +90,7 @@ endif
 TOPSRCDIR = $(CWD)
 endif
 
-AUTOCONF := autoconf-2.13
+AUTOCONF := autoconf213
 MKDIR := mkdir
 SH := /bin/sh
 ifndef MAKE
diff --git a/client.py b/client.py
index bb6da287d69..f1ec8c4975c 100644
--- a/client.py
+++ b/client.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
-NSPR_CO_TAG = 'NSPRPUB_PRE_4_2_CLIENT_BRANCH'
-NSS_CO_TAG  = 'NSS_3_11_7_BETA1'
+NSPR_CO_TAG = 'NSPR_HEAD_20070713'
+NSS_CO_TAG  = 'NSS_3_12_ALPHA1B'
 
 NSPR_DIRS = ('nsprpub',)
 NSS_DIRS  = ('dbm',