diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 4cfacf4bff09..240900979eb8 100755
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -38,3 +38,4 @@ MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61}
 MOZ_EXTENSION_MANAGER=1
 
 MOZ_SYS_MSG=1
+MOZ_TOOLKIT_SEARCH=
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 5de776e9f370..2f3e3b20bb33 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -344,8 +344,6 @@
 @BINPATH@/components/nsPrivateBrowsingService.manifest
 @BINPATH@/components/nsPrivateBrowsingService.js
 @BINPATH@/components/toolkitsearch.manifest
-@BINPATH@/components/nsSearchService.js
-@BINPATH@/components/nsSearchSuggestions.js
 @BINPATH@/components/nsTryToClose.manifest
 @BINPATH@/components/nsTryToClose.js
 @BINPATH@/components/passwordmgr.manifest