diff --git a/scripts/populate_search_index.php b/scripts/populate_search_index.php
index fcbb6d63f0..b943dedb9c 100755
--- a/scripts/populate_search_index.php
+++ b/scripts/populate_search_index.php
@@ -8,6 +8,7 @@
 // Elastic search config
 define('ES_URL', 'http://localhost:9200');
 define('ES_INDEX', 'documentation');
+define('CAKEPHP_VERSION', '1-1');
 
 
 function main($argv) {
@@ -37,7 +38,7 @@ function updateIndex($lang, $file) {
 	$id = str_replace('/', '-', $id);
 	$id = trim($id, '-');
 
-	$url = implode('/', array(ES_URL, ES_INDEX, $lang, $id));
+	$url = implode('/', array(ES_URL, ES_INDEX, CAKEPHP_VERSION . '-' . $lang, $id));
 
 	$data = array(
 		'contents' => $fileData['contents'],
diff --git a/themes/cakephp/static/app.js b/themes/cakephp/static/app.js
index ac234bf3da..8eb818430f 100644
--- a/themes/cakephp/static/app.js
+++ b/themes/cakephp/static/app.js
@@ -3,6 +3,10 @@ if (/cakephp\.org/.test(document.domain)) {
 }
 
 App = {};
+App.config = {
+	url: 'http://search.cakephp.org/search',
+	version: '1-1'
+};
 
 App.Book = (function() {
 
@@ -49,7 +53,7 @@ App.Book = (function() {
  
 	return {
 		init : init
-	}
+	};
 })();
 
 // Inline search form, and standalone search form.
@@ -60,7 +64,6 @@ App.InlineSearch = (function () {
 	var searchResults;
 	var searchInput;
 	var doSearch;
-	var searchUrl = 'http://search.cakephp.org/search';
 
 	var delay = (function(){
 		var timer;
@@ -112,11 +115,11 @@ App.InlineSearch = (function () {
 	};
 
 	var executeSearch = function (value, searchResults, limit, page) {
-		var query = {lang: window.lang, q: value};
+		var query = {lang: window.lang, q: value, version: App.config.version};
 		if (page) {
 			query.page = page;
 		}
-		var url = searchUrl + '?' + jQuery.param(query);
+		var url = App.config.url + '?' + jQuery.param(query);
 		var xhr = $.ajax({
 			url: url,
 			dataType: 'json',
@@ -161,7 +164,7 @@ App.InlineSearch = (function () {
 	return {
 		init: init,
 		delay: delay,
-		searchUrl: searchUrl,
+		searchUrl: App.config.url,
 		createSearch: createSearch,
 		executeSearch: executeSearch
 	};