--- a/Makefile.in
+++ b/Makefile.in
@@ -9,21 +9,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = inspector
 DOMi_VERSION = 2.0.15pre
 
-DIRS = \
-  base \
-  resources \
-  $(NULL)
-
 XPI_NAME               = inspector
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
 INSTALL_EXTENSION_ID   = inspector@mozilla.org
 XPI_PKGNAME            = inspector-$(DOMi_VERSION)
 
 PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/inspector.js
 

--- a/base/Makefile.in
+++ b/base/Makefile.in
@@ -6,12 +6,10 @@
 
 DEPTH=../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = js
-
 include $(topsrcdir)/config/rules.mk
 

new file mode 100644
--- /dev/null
+++ b/base/js/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

new file mode 100644
--- /dev/null
+++ b/base/moz.build
@@ -0,0 +1,8 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    'js',
+]

--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH=../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=src
-
 include $(topsrcdir)/config/rules.mk
 

new file mode 100644
--- /dev/null
+++ b/build/moz.build
@@ -0,0 +1,8 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    'src',
+]

deleted file mode 100755
--- a/makefiles.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-add_makefiles "
-  extensions/inspector/Makefile
-  extensions/inspector/base/Makefile
-  extensions/inspector/build/Makefile
-  extensions/inspector/resources/Makefile
-  extensions/inspector/resources/locale/Makefile
-"

new file mode 100644
--- /dev/null
+++ b/moz.build
@@ -0,0 +1,10 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    'base',
+    'resources',
+]
+

--- a/resources/locale/Makefile.in
+++ b/resources/locale/Makefile.in
@@ -6,16 +6,18 @@
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+STANDALONE_MAKEFILE := 1
+
 XPI_NAME               = inspector
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 # Let jar.mn do its happy-dance
 

new file mode 100644
--- /dev/null
+++ b/resources/moz.build
@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+CONFIGURE_SUBST_FILES += ['locale/Makefile']
+