diff --git a/mozilla/client.mk b/mozilla/client.mk
index e67fb5bc6b8..63c37ac04e8 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -52,14 +52,14 @@
 #
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
-MOZ_CO_TAG = MOZILLA_0_9_2_BRANCH
-NSPR_CO_TAG = MOZILLA_0_9_2_BRANCH
-PSM_CO_TAG = MOZILLA_0_9_2_BRANCH
-NSS_CO_TAG = MOZILLA_0_9_2_BRANCH
-LDAPCSDK_CO_TAG = MOZILLA_0_9_2_BRANCH
-ACCESSIBLE_CO_TAG = MOZILLA_0_9_2_BRANCH
-GFX2_CO_TAG = MOZILLA_0_9_2_BRANCH
-IMGLIB2_CO_TAG = MOZILLA_0_9_2_BRANCH
+MOZ_CO_TAG = NOIMG_20010801_BRANCH
+NSPR_CO_TAG = NSPRPUB_CLIENT_BRANCH
+PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
+NSS_CO_TAG = NSS_CLIENT_TAG
+LDAPCSDK_CO_TAG = LDAPCSDK_40_BRANCH
+ACCESSIBLE_CO_TAG = 
+GFX2_CO_TAG = 
+IMGLIB2_CO_TAG = 
 BUILD_MODULES = all
 
 #######################################################################