diff --git a/toolkit/components/search/SearchStaticData.jsm b/toolkit/components/search/current/SearchStaticData.jsm
similarity index 100%
rename from toolkit/components/search/SearchStaticData.jsm
rename to toolkit/components/search/current/SearchStaticData.jsm
diff --git a/toolkit/components/search/SearchSuggestionController.jsm b/toolkit/components/search/current/SearchSuggestionController.jsm
similarity index 100%
rename from toolkit/components/search/SearchSuggestionController.jsm
rename to toolkit/components/search/current/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/current/moz.build b/toolkit/components/search/current/moz.build
new file mode 100644
index 0000000000..4ca6790872
--- /dev/null
+++ b/toolkit/components/search/current/moz.build
@@ -0,0 +1,31 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+EXTRA_COMPONENTS += [
+    'nsSearchSuggestions.js',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+    DEFINES['HAVE_SIDEBAR'] = True
+    EXTRA_COMPONENTS += [
+    'nsSidebar.js',
+    ]
+
+EXTRA_JS_MODULES += [
+    'SearchSuggestionController.jsm',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'toolkitsearch.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'SearchStaticData.jsm',
+]
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js
similarity index 100%
rename from toolkit/components/search/nsSearchService.js
rename to toolkit/components/search/current/nsSearchService.js
diff --git a/toolkit/components/search/nsSearchSuggestions.js b/toolkit/components/search/current/nsSearchSuggestions.js
similarity index 100%
rename from toolkit/components/search/nsSearchSuggestions.js
rename to toolkit/components/search/current/nsSearchSuggestions.js
diff --git a/toolkit/components/search/nsSidebar.js b/toolkit/components/search/current/nsSidebar.js
similarity index 100%
rename from toolkit/components/search/nsSidebar.js
rename to toolkit/components/search/current/nsSidebar.js
diff --git a/toolkit/components/search/toolkitsearch.manifest b/toolkit/components/search/current/toolkitsearch.manifest
similarity index 100%
rename from toolkit/components/search/toolkitsearch.manifest
rename to toolkit/components/search/current/toolkitsearch.manifest
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index 08bd549059..739dc6ab89 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -6,30 +6,8 @@
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
 
-EXTRA_COMPONENTS += [
-    'nsSearchSuggestions.js',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'nsSearchService.js',
-]
-
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
-    DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
-    'nsSidebar.js',
-    ]
-
-EXTRA_JS_MODULES += [
-    'SearchSuggestionController.jsm',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'toolkitsearch.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'SearchStaticData.jsm',
+DIRS += [
+    'current',
 ]
 
 with Files('**'):