diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index c45f190f5315..6b974d23f0da 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -170,6 +170,7 @@
 @BINPATH@/components/dom_system_gonk.xpt
 @BINPATH@/components/dom_icc.xpt
 @BINPATH@/components/dom_cellbroadcast.xpt
+@BINPATH@/components/dom_wappush.xpt
 #endif
 #ifdef MOZ_B2G_FM
 @BINPATH@/components/dom_fm.xpt
@@ -599,7 +600,7 @@
 #endif
 
 ; [Layout Engine Resources]
-; Style Sheets, Graphics and other Resources used by the layout engine. 
+; Style Sheets, Graphics and other Resources used by the layout engine.
 @BINPATH@/res/EditorOverride.css
 @BINPATH@/res/contenteditable.css
 @BINPATH@/res/designmode.css
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index c9519c45d554..abe2d1b2d7e2 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -175,6 +175,7 @@
 @BINPATH@/components/dom_wifi.xpt
 @BINPATH@/components/dom_system_gonk.xpt
 @BINPATH@/components/dom_icc.xpt
+@BINPATH@/components/dom_wappush.xpt
 #endif
 @BINPATH@/components/dom_battery.xpt
 #ifdef MOZ_B2G_BT
@@ -617,7 +618,7 @@
 #endif
 
 ; [Layout Engine Resources]
-; Style Sheets, Graphics and other Resources used by the layout engine. 
+; Style Sheets, Graphics and other Resources used by the layout engine.
 @BINPATH@/res/EditorOverride.css
 @BINPATH@/res/contenteditable.css
 @BINPATH@/res/designmode.css
diff --git a/dom/moz.build b/dom/moz.build
index 8006c3b67d85..7ebedf1211bc 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -71,6 +71,7 @@ PARALLEL_DIRS += [
     'workers',
     'camera',
     'audiochannel',
+    'wappush'
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
diff --git a/dom/wappush/Makefile.in b/dom/wappush/Makefile.in
new file mode 100644
index 000000000000..bfb4a4b4e637
--- /dev/null
+++ b/dom/wappush/Makefile.in
@@ -0,0 +1,14 @@
+# 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
+
+include $(topsrcdir)/config/rules.mk
diff --git a/dom/wappush/interfaces/moz.build b/dom/wappush/interfaces/moz.build
new file mode 100644
index 000000000000..9c17451f7bf4
--- /dev/null
+++ b/dom/wappush/interfaces/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/.
+
+XPIDL_SOURCES += [
+]
+
+XPIDL_MODULE = 'dom_wappush'
+
diff --git a/dom/wappush/moz.build b/dom/wappush/moz.build
new file mode 100644
index 000000000000..a21f6787c8ec
--- /dev/null
+++ b/dom/wappush/moz.build
@@ -0,0 +1,9 @@
+# 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/.
+
+PARALLEL_DIRS += ['interfaces', 'src']
+
+if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/dom/wappush/src/Makefile.in b/dom/wappush/src/Makefile.in
new file mode 100644
index 000000000000..eab44eb676e8
--- /dev/null
+++ b/dom/wappush/src/Makefile.in
@@ -0,0 +1,23 @@
+# 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) \
+  $(NULL)
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef MOZ_B2G_RIL
+EXTRA_COMPONENTS = \
+  $(NULL)
+
+EXTRA_JS_MODULES = \
+  $(NULL)
+endif
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/dom/wappush/src/moz.build b/dom/wappush/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/dom/wappush/src/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/.
+
diff --git a/dom/wappush/tests/xpcshell.ini b/dom/wappush/tests/xpcshell.ini
new file mode 100644
index 000000000000..a35b63f7286a
--- /dev/null
+++ b/dom/wappush/tests/xpcshell.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+head =
+tail =
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 15be2202c674..465680455fd9 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -14,6 +14,7 @@
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
+[include:dom/wappush/tests/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/network/tests/unit_ipc/xpcshell.ini]
 [include:dom/network/tests/unit_stats/xpcshell.ini]