diff --git a/mozilla/build/unix/modules.mk b/mozilla/build/unix/modules.mk
index b682e660650..6e90edda530 100644
--- a/mozilla/build/unix/modules.mk
+++ b/mozilla/build/unix/modules.mk
@@ -87,18 +87,10 @@ BM_CVS_NS_necko		= $(BM_CVS_NS_xpcom) intl/locale/idl intl/strres/public modules
 BM_DIRS_transformiix	= extensions/transformiix
 BM_CVS_transformiix     = extensions/transformiix
 
-#
-# psm
-#
-BM_DIRS_psm	= $(BM_DIRS_dbm) $(BM_DIRS_xpcom) security netwerk/base/public netwerk/socket/base dom/public $(BM_DIRS_js) extensions/psm-glue
-BM_DEP_DIRS_psm	= $(BM_DEP_DIRS_dbm) $(BM_DEP_DIRS_xpcom) $(BM_DEP_DIRS_js) intl/locale/idl intl/locale/public intl/strres/public uriloader/base modules/libpref/public profile/public caps/idl netwerk/protocol/http/public gfx/idl gfx/public rdf/base/idl xpfe/appshell/public widget/public docshell/base layout/html/forms/public layout/base/public content/base/public dom/src/base modules/oji/public caps/include netwerk/build gfx2/public embedding/components/windowwatcher/public
-BM_CVS_psm	= $(BM_CVS_dbm) $(BM_CVS_xpcom) $(BM_CVS_js) security netwerk/base/public netwerk/socket/base dom/public $(BM_CVS_js) extensions/psm-glue
-BM_CVS_NS_psm	= $(BM_CVS_NS_dbm) $(BM_CVS_NS_xpcom) $(BM_CVS_NS_js) intl/locale/idl intl/locale/public intl/strres/public uriloader/base modules/libpref/public profile/public caps/idl netwerk/protocol/http/public gfx/idl gfx/public rdf/base/idl xpfe/appshell/public widget/public docshell/base layout/html/forms/public layout/base/public content/base/public dom/src/base modules/oji/public caps/include netwerk/build gfx2/public embedding/components/windowwatcher/public
-
 #
 # psm2
 #
-BM_DIRS_psm2	= $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security security/manager
+BM_DIRS_psm2	= $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security/manager
 BM_DEP_DIRS_psm2= \
 	$(BM_DEP_DIRS_xpcom) \
 	netwerk/base/public netwerk/protocol/http/public netwerk/build \
@@ -130,6 +122,14 @@ BM_CVS_NS_psm2	= \
 	content/base/public \
 	intl/locale/public
 
+#
+# psm is obsolete.  Make it pull psm2 instead
+#
+BM_DIRS_psm	= $(BM_DIRS_psm2)
+BM_DEP_DIRS_psm = $(BM_DEP_DIRS_psm2)
+BM_CVS_psm	= $(BM_CVS_psm2)
+BM_CVS_NS_psm	= $(BM_CVS_NS_psm2)
+
 #
 # Tally
 #