diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 18eee930d723..bd65d23e8c79 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -136,6 +136,10 @@
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_apps.xpt
 @BINPATH@/components/dom_base.xpt
+#ifdef MOZ_B2G_RIL
+@BINPATH@/components/dom_telephony.xpt
+@BINPATH@/components/dom_telephony_worker.xpt
+#endif
 @BINPATH@/components/dom_battery.xpt
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_core.xpt
@@ -358,6 +362,12 @@
 @BINPATH@/components/contentSecurityPolicy.js
 @BINPATH@/components/contentAreaDropListener.manifest
 @BINPATH@/components/contentAreaDropListener.js
+#ifdef MOZ_B2G_RIL
+@BINPATH@/components/nsTelephonyWorker.manifest
+@BINPATH@/components/nsTelephonyWorker.js
+@BINPATH@/components/Telephony.manifest
+@BINPATH@/components/Telephony.js
+#endif
 @BINPATH@/components/BrowserProfileMigrators.manifest
 @BINPATH@/components/ChromeProfileMigrator.js
 #ifdef XP_MACOSX
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 7225e1891a48..77f9006e7206 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -68,6 +68,10 @@ components/nsUrlClassifierTable.js
 components/nsXmlRpcClient.js
 components/pluginGlue.js
 components/sidebar.xpt
+#ifdef MOZ_B2G_RIL
+components/dom_telephony.xpt
+components/dom_telephony_worker.xpt
+#endif
 components/WeaveCrypto.js
 components/WeaveCrypto.manifest
 components/xmlextras.xpt
@@ -913,6 +917,12 @@ xpicleanup@BIN_SUFFIX@
   components/PlacesProtocolHandler.js
   components/storage-Legacy.js
   components/storage-mozStorage.js
+#ifdef MOZ_B2G_RIL
+  components/nsTelephonyWorker.manifest
+  components/nsTelephonyWorker.js
+  components/Telephony.manifest
+  components/Telephony.js
+#endif
   components/txEXSLTRegExFunctions.js
   components/Weave.js
   components/WebContentConverter.js
@@ -1130,6 +1140,10 @@ xpicleanup@BIN_SUFFIX@
   components/docshell.xpt
   components/dom.xpt
   components/dom_base.xpt
+#ifdef MOZ_B2G_RIL
+  components/dom_telephony.xpt
+  components/dom_telephony_worker.xpt
+#endif
   components/dom_canvas.xpt
   components/dom_core.xpt
   components/dom_css.xpt
diff --git a/dom/Makefile.in b/dom/Makefile.in
index 70734cdee6ea..bbd3cdff10f4 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -83,6 +83,10 @@ DIRS += \
   workers \
   $(NULL)
 
+ifdef MOZ_B2G_RIL #{
+DIRS += telephony
+endif #}
+
 ifdef ENABLE_TESTS
 DIRS += tests
 ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in
index 534be130daa0..e8ffb11a08f3 100644
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -58,6 +58,15 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
+XPIDLSRCS = \
+  mozIDOMTelephony.idl \
+  $(NULL)
+
+EXTRA_COMPONENTS = \
+  Telephony.manifest \
+  Telephony.js \
+  $(NULL)
+
 DIRS += worker-component
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/telephony/worker-component/Makefile.in b/dom/telephony/worker-component/Makefile.in
index 031037378cf2..c410f1ca6b6b 100644
--- a/dom/telephony/worker-component/Makefile.in
+++ b/dom/telephony/worker-component/Makefile.in
@@ -42,6 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+EXTRA_COMPONENTS = \
+  nsTelephonyWorker.manifest \
+  nsTelephonyWorker.js \
+  $(NULL)
+
+EXTRA_JS_MODULES = \
+  ril_consts.js \
+  ril_worker.js \
+  $(NULL)
+
 XPIDL_MODULE = dom_telephony_worker
 XPIDLSRCS = \
   nsITelephonyWorker.idl \
diff --git a/mobile/xul/installer/package-manifest.in b/mobile/xul/installer/package-manifest.in
index e284387564e0..2a4e12f672a5 100644
--- a/mobile/xul/installer/package-manifest.in
+++ b/mobile/xul/installer/package-manifest.in
@@ -150,6 +150,10 @@
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_base.xpt
+#ifdef MOZ_B2G_RIL
+@BINPATH@/components/dom_telephony.xpt
+@BINPATH@/components/dom_telephony_worker.xpt
+#endif
 @BINPATH@/components/dom_battery.xpt
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_core.xpt
@@ -384,6 +388,12 @@
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/nsFilePicker.js
 @BINPATH@/components/nsFilePicker.manifest
+#ifdef MOZ_B2G_RIL
+@BINPATH@/components/nsTelephonyWorker.manifest
+@BINPATH@/components/nsTelephonyWorker.js
+@BINPATH@/components/Telephony.manifest
+@BINPATH@/components/Telephony.js
+#endif
 #ifdef XP_MACOSX
 @BINPATH@/components/libalerts_s.dylib
 #endif