diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index d1126ff27aa..7f25883a4ed 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -617,6 +617,8 @@ xpcom/tests/dynamic/Makefile
 xpcom/tests/services/Makefile
 "
 
+MAKEFILES_string="$MAKEFILES_xpcom"
+
 MAKEFILES_xpinstall="
 xpinstall/Makefile
 xpinstall/packager/Makefile
@@ -1057,6 +1059,8 @@ else
 		;;
 	    psm) add_makefiles "$MAKEFILES_dbm $MAKEFILES_xpcom $MAKEFILES_security $MAKEFILES_js $MAKEFILES_psm_glue"
 		;;
+            string) add_makefiles "$MAKEFILES_string"
+                ;;
 	    transformiix) add_makefiles "$MAKEFILES_transformiix"
 		;;
 	    access-builtin) add_makefiles "$MAKEFILES_access_builtin"
diff --git a/mozilla/build/unix/modules.mk b/mozilla/build/unix/modules.mk
index ce7dc464725..e7890a1bef3 100644
--- a/mozilla/build/unix/modules.mk
+++ b/mozilla/build/unix/modules.mk
@@ -54,13 +54,19 @@ BM_DIRS_js	= $(NSPRPUB_DIR) js
 BM_CVS_js	= $(NSPRPUB_DIR)
 BM_CVS_NS_js 	= js js/src js/src/fdlibm
 
+#
+# string
+#
+BM_DIRS_string	= $(NSPRPUB_DIR) string
+BM_CVS_string	= $(NSPRPUB_DIR) string
+
 #
 # xpcom
 #
-BM_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom
+BM_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg string xpcom
 BM_DEP_DIRS_xpcom	= intl/unicharutil/public intl/uconv/public modules/libjar
 BM_CVS_NS_xpcom		= xpcom xpcom/typelib xpcom/typelib/xpidl intl/unicharutil/public intl/uconv/public
-BM_CVS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom/typelib/xpt xpcom/base xpcom/ds xpcom/io xpcom/components xpcom/threads xpcom/reflect xpcom/proxy xpcom/build xpcom/tools xpcom/sample modules/libjar
+BM_CVS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom/typelib/xpt xpcom/base xpcom/ds xpcom/io xpcom/components xpcom/threads xpcom/reflect xpcom/proxy xpcom/build xpcom/tools xpcom/sample modules/libjar string
 
 #
 # xpconnect