diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index b43c39708a36..b47ac0f99e8e 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -16,6 +16,7 @@ MAKEFILES_dom="
   dom/interfaces/apps/Makefile
   dom/interfaces/base/Makefile
   dom/interfaces/canvas/Makefile
+  dom/interfaces/contacts/Makefile
   dom/interfaces/core/Makefile
   dom/interfaces/css/Makefile
   dom/interfaces/devicestorage/Makefile
@@ -27,6 +28,7 @@ MAKEFILES_dom="
   dom/interfaces/offline/Makefile
   dom/interfaces/notification/Makefile
   dom/interfaces/range/Makefile
+  dom/interfaces/settings/Makefile
   dom/interfaces/sidebar/Makefile
   dom/interfaces/storage/Makefile
   dom/interfaces/stylesheets/Makefile
@@ -39,20 +41,34 @@ MAKEFILES_dom="
   dom/activities/interfaces/Makefile
   dom/activities/src/Makefile
   dom/alarm/Makefile
+  dom/apps/Makefile
+  dom/apps/src/Makefile
   dom/base/Makefile
   dom/battery/Makefile
+  dom/bindings/Makefile
+  dom/browser-element/Makefile
+  dom/contacts/Makefile
+  dom/devicestorage/Makefile
+  dom/devicestorage/ipc/Makefile
   dom/file/Makefile
+  dom/identity/Makefile
   dom/indexedDB/Makefile
+  dom/indexedDB/ipc/Makefile
   dom/ipc/Makefile
   dom/locales/Makefile
+  dom/media/Makefile
   dom/messages/Makefile
   dom/messages/interfaces/Makefile
+  dom/mms/Makefile
+  dom/mms/interfaces/Makefile
+  dom/mms/src/Makefile
   dom/network/Makefile
   dom/network/interfaces/Makefile
   dom/network/src/Makefile
   dom/plugins/base/Makefile
   dom/plugins/ipc/Makefile
   dom/power/Makefile
+  dom/settings/Makefile
   dom/sms/Makefile
   dom/sms/interfaces/Makefile
   dom/sms/src/Makefile
@@ -721,17 +737,49 @@ if [ "$ENABLE_TESTS" ]; then
     docshell/test/chrome/Makefile
     docshell/test/navigation/Makefile
     dom/alarm/test/Makefile
+    dom/apps/tests/Makefile
+    dom/base/test/Makefile
     dom/battery/test/Makefile
+    dom/bindings/test/Makefile
+    dom/browser-element/mochitest/Makefile
+    dom/contacts/tests/Makefile
+    dom/devicestorage/test/Makefile
+    dom/file/test/Makefile
+    dom/identity/tests/Makefile
+    dom/imptests/Makefile
+    dom/imptests/editing/Makefile
+    dom/imptests/editing/conformancetest/Makefile
+    dom/imptests/editing/css/Makefile
+    dom/imptests/editing/selecttest/Makefile
+    dom/imptests/failures/editing/conformancetest/Makefile
+    dom/imptests/failures/editing/selecttest/Makefile
+    dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile
+    dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile
+    dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile
+    dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile
+    dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile
+    dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile
+    dom/imptests/html/tests/submission/Mozilla/Makefile
+    dom/imptests/html/tests/submission/Opera/microdata/Makefile
+    dom/imptests/webapps/DOMCore/tests/approved/Makefile
+    dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile
+    dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile
+    dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile
+    dom/imptests/webapps/WebStorage/tests/submissions/Makefile
+    dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile
+    dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile
     dom/indexedDB/test/Makefile
     dom/indexedDB/test/unit/Makefile
     dom/network/tests/Makefile
     dom/plugins/test/Makefile
     dom/plugins/test/testplugin/Makefile
     dom/power/test/Makefile
+    dom/settings/tests/Makefile
     dom/sms/tests/Makefile
     dom/src/foo/Makefile
     dom/src/json/test/Makefile
     dom/src/jsurl/test/Makefile
+    dom/system/tests/Makefile
     dom/tests/Makefile
     dom/tests/mochitest/Makefile
     dom/tests/mochitest/ajax/Makefile
@@ -776,8 +824,11 @@ if [ "$ENABLE_TESTS" ]; then
     dom/tests/mochitest/geolocation/Makefile
     dom/tests/mochitest/localstorage/Makefile
     dom/tests/mochitest/orientation/Makefile
+    dom/tests/mochitest/pointerlock/Makefile
     dom/tests/mochitest/sessionstorage/Makefile
     dom/tests/mochitest/storageevent/Makefile
+    dom/tests/mochitest/webapps/Makefile
+    dom/tests/mochitest/webapps/apps/Makefile
     dom/tests/mochitest/whatwg/Makefile
     dom/workers/test/Makefile
     dom/workers/test/extensions/Makefile