diff --git a/config/module2dir.pl b/config/module2dir.pl
index 4b160ab35f9..6b0f7e98cba 100755
--- a/config/module2dir.pl
+++ b/config/module2dir.pl
@@ -50,7 +50,7 @@ my %map = (
   'editor',             'editor',
   'embed_base',         'embedding/base',
   'embed_lite',         'embedding/lite',
-  'embedcomponents',    'embedding/components/appstartup',
+  'embedcomponents',    'embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build',
   'expat',              'expat',
   'exthandler',         'uriloader/exthandler',
   'filepicker',         'xpfe/components/filepicker',
@@ -175,7 +175,7 @@ my %map = (
   'view',               'view',
   'wallet',             'extensions/wallet',
   'walletviewers',      'extensions/wallet/build extensions/wallet/cookieviewer extensions/wallet/editor extensions/wallet/signonviewer extensions/wallet/walletpreview',
-  'webbrwsr',           'embedding/browser/webBrowser',
+  'webbrwsr',           'embedding/browser/webBrowser embedding/browser/build',
   'webbrowserpersist',  'embedding/components/webbrowserpersist',
   'webshell',           'webshell',
   'webshell_tests',     'webshell/tests',