diff --git a/mozilla/xpfe/Makefile.in b/mozilla/xpfe/Makefile.in
index e5ad8df8a04..c25dc1558f4 100644
--- a/mozilla/xpfe/Makefile.in
+++ b/mozilla/xpfe/Makefile.in
@@ -53,7 +53,10 @@ DIRS += \
         $(NULL)
 else
 ifndef MOZ_SUNBIRD
-DIRS += browser communicator global
+DIRS += browser global
+ifndef MOZ_SUITE
+DIRS += communicator
+endif
 endif
 endif
 
diff --git a/mozilla/xpfe/communicator/jar.mn b/mozilla/xpfe/communicator/jar.mn
index 49713c92377..ee4b5f75026 100644
--- a/mozilla/xpfe/communicator/jar.mn
+++ b/mozilla/xpfe/communicator/jar.mn
@@ -1,5 +1,4 @@
 comm.jar:
-#ifndef MOZ_SUITE
 #ifdef MOZ_XUL_APP
 % content communicator-platform %content/communicator-platform/ platform xpcnativewrappers=yes
 % content communicator-region %content/communicator-region/ xpcnativewrappers=yes
@@ -51,4 +50,3 @@ comm.jar:
     content/communicator/findUtils.js                    (resources/content/findUtils.js)
     content/communicator/printPreviewBindings.xml        (resources/content/printPreviewBindings.xml)
     content/communicator/printing.js                     (resources/content/printing.js)
-#endif