diff --git a/mozilla/mailnews/extensions/Makefile.in b/mozilla/mailnews/extensions/Makefile.in
index 4523317be42..f6194ffe920 100644
--- a/mozilla/mailnews/extensions/Makefile.in
+++ b/mozilla/mailnews/extensions/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_PSM
+ifdef BUILD_SMIME
 DIRS		= smime
 endif
 
diff --git a/mozilla/mailnews/extensions/makefile.win b/mozilla/mailnews/extensions/makefile.win
index b8a97a62d74..29d26a61d1a 100644
--- a/mozilla/mailnews/extensions/makefile.win
+++ b/mozilla/mailnews/extensions/makefile.win
@@ -21,6 +21,8 @@
 
 DEPTH=..\..
 
+!if defined(BUILD_SMIME)
 DIRS=smime
+!endif
 
 include <$(DEPTH)\config\rules.mak>