--- a/client.mk
+++ b/client.mk
@@ -85,17 +85,17 @@ endif
 
 ifndef TOPSRCDIR
 ifeq (,$(wildcard client.mk))
 $(error Must run from the client.mk directory, or specify TOPSRCDIR)
 endif
 TOPSRCDIR = $(CWD)
 endif
 
-AUTOCONF := autoconf-2.13
+AUTOCONF := autoconf213
 MKDIR := mkdir
 SH := /bin/sh
 ifndef MAKE
 MAKE := gmake
 endif
 PERL ?= perl
 PYTHON ?= python
 

--- a/client.py
+++ b/client.py
@@ -1,12 +1,12 @@
 #!/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',
              'security/nss',
              'security/coreconf',
              'security/dbm')
 
 # URL of the default hg repository to clone for Tamarin.