diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index cfaa3db3f33..4a71ea98ed2 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -151,6 +151,9 @@ libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
+ifdef MOZ_WEBAPP_RUNTIME
+	@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
+endif
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
index cd9af1fae62..7e85def502b 100755
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -6,8 +6,8 @@ def test(mod, path, entity = None):
   import re
   # ignore anything but Firefox
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "browser", "browser/metro", "extensions/reporter",
-                 "extensions/spellcheck",
+                 "browser", "browser/metro", "webapprt",
+                 "extensions/reporter", "extensions/spellcheck",
                  "other-licenses/branding/firefox",
                  "browser/branding/official",
                  "services/sync"):
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 524e347e99d..b3301ef9b7e 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -132,9 +132,3 @@
 % locale pdf.js @AB_CD@ %locale/pdfviewer/
     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
-#ifdef MOZ_WEBAPP_RUNTIME
-../../webapprt/chrome/@AB_CD@.jar:
-% locale webapprt @AB_CD@ %locale/webapprt/
-    locale/webapprt/webapp.dtd                     (%webapprt/webapp.dtd)
-    locale/webapprt/webapp.properties              (%webapprt/webapp.properties)
-#endif
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
index df5eb7ac03e..5056b5ddc46 100644
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -17,6 +17,7 @@ dirs = browser
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
+webapprt = webapprt/locales/l10n.ini
 
 [extras]
 dirs = extensions/spellcheck
diff --git a/toolkit/mozapps/installer/windows/nsis/makensis.mk b/toolkit/mozapps/installer/windows/nsis/makensis.mk
index 45aeaf046b1..40c4adafe00 100644
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -96,6 +96,6 @@ webapp_uninstaller::
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/toolkit/mozapps/installer/windows/nsis/,$(TOOLKIT_NSIS_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/Plugins/,$(CUSTOM_NSIS_PLUGINS)) $(CONFIG_DIR)
 	cd $(CONFIG_DIR) && $(MAKENSISU) webapp-uninstaller.nsi
-	$(NSINSTALL) -D $(FINAL_TARGET)
-	cp $(CONFIG_DIR)/webapp-uninstaller.exe $(FINAL_TARGET)
+	$(NSINSTALL) -D $(DIST)/bin
+	cp $(CONFIG_DIR)/webapp-uninstaller.exe $(DIST)/bin
 endif
diff --git a/webapprt/defs.mk b/webapprt/defs.mk
new file mode 100644
index 00000000000..02d807a413e
--- /dev/null
+++ b/webapprt/defs.mk
@@ -0,0 +1,2 @@
+DIST_SUBDIR=webapprt
+XPI_ROOT_APPID=webapprt@mozilla.org
diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in
index ede0ee0f856..31e1e73efed 100644
--- a/webapprt/gtk2/Makefile.in
+++ b/webapprt/gtk2/Makefile.in
@@ -32,6 +32,8 @@ LIBS = \
 
 NSDISTMODE = copy
 
+PROGRAMS_DEST = $(DIST)/bin
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
diff --git a/webapprt/locales/Makefile.in b/webapprt/locales/Makefile.in
new file mode 100644
index 00000000000..1975558f3ed
--- /dev/null
+++ b/webapprt/locales/Makefile.in
@@ -0,0 +1,15 @@
+# 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/.
+
+DEPTH     = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+relativesrcdir = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/locales/en-US/webapp-uninstaller/webapp-uninstaller.properties b/webapprt/locales/en-US/webapp-uninstaller/webapp-uninstaller.properties
similarity index 100%
rename from browser/locales/en-US/webapp-uninstaller/webapp-uninstaller.properties
rename to webapprt/locales/en-US/webapp-uninstaller/webapp-uninstaller.properties
diff --git a/browser/locales/en-US/webapprt/webapp.dtd b/webapprt/locales/en-US/webapprt/webapp.dtd
similarity index 100%
rename from browser/locales/en-US/webapprt/webapp.dtd
rename to webapprt/locales/en-US/webapprt/webapp.dtd
diff --git a/browser/locales/en-US/webapprt/webapp.properties b/webapprt/locales/en-US/webapprt/webapp.properties
similarity index 100%
rename from browser/locales/en-US/webapprt/webapp.properties
rename to webapprt/locales/en-US/webapprt/webapp.properties
diff --git a/webapprt/locales/jar.mn b/webapprt/locales/jar.mn
new file mode 100644
index 00000000000..cf159450d24
--- /dev/null
+++ b/webapprt/locales/jar.mn
@@ -0,0 +1,9 @@
+#filter substitution
+# 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/.
+
+@AB_CD@.jar:
+% locale webapprt @AB_CD@ %locale/webapprt/
+    locale/webapprt/webapp.dtd                     (%webapprt/webapp.dtd)
+    locale/webapprt/webapp.properties              (%webapprt/webapp.properties)
diff --git a/webapprt/locales/l10n.ini b/webapprt/locales/l10n.ini
new file mode 100644
index 00000000000..a0c5e61c8bf
--- /dev/null
+++ b/webapprt/locales/l10n.ini
@@ -0,0 +1,9 @@
+; 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/.
+
+[general]
+depth = ../..
+
+[compare]
+dirs = webapprt
diff --git a/webapprt/locales/moz.build b/webapprt/locales/moz.build
new file mode 100644
index 00000000000..89251dc3962
--- /dev/null
+++ b/webapprt/locales/moz.build
@@ -0,0 +1,4 @@
+# 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/.
diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in
index d6cf6574326..d1c10639894 100644
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -34,6 +34,8 @@ LIBS = \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
   $(NULL)
 
+PROGRAMS_DEST = $(DIST)/bin
+
 include $(topsrcdir)/config/rules.mk
 
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
diff --git a/webapprt/moz.build b/webapprt/moz.build
index 16af5b7f15e..a6ef109b828 100644
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -11,4 +11,5 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     DIRS += ['gtk2']
 
+DIRS += ['locales']
 TEST_DIRS += ['test']
diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in
index 73e59490220..6448bbe0b29 100644
--- a/webapprt/win/Makefile.in
+++ b/webapprt/win/Makefile.in
@@ -69,12 +69,12 @@ endif
 # Uninstaller
 ifdef LOCALE_MERGEDIR
 PPL_LOCALE_ARGS = \
-  --l10n-dir=$(LOCALE_MERGEDIR)/browser/webapp-uninstaller \
-  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/webapp-uninstaller \
-  --l10n-dir=$(topsrcdir)/browser/locales/en-US/webapp-uninstaller \
+  --l10n-dir=$(LOCALE_MERGEDIR)/webapprt/webapp-uninstaller \
+  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,webapprt/locales)/webapp-uninstaller \
+  --l10n-dir=$(topsrcdir)/webapprt/locales/en-US/webapp-uninstaller \
   $(NULL)
 else
-PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/webapp-uninstaller
+PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,webapprt/locales)/webapp-uninstaller
 endif
 
 libs::
@@ -94,6 +94,8 @@ libs::
 
 GARBAGE_DIRS += instgen
 
+PROGRAMS_DEST = $(DIST)/bin
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk