diff --git a/rhodecode/lib/paster_commands/make_index.py b/rhodecode/lib/paster_commands/make_index.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/paster_commands/make_index.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.lib.paster_commands.make_index
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    make-index paster command for RhodeCode
+
+    :created_on: Aug 17, 2010
+    :author: marcink
+    :copyright: (C) 2010-2013 Marcin Kuzminski <marcin@python-works.com>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import with_statement
+
+import os
+import sys
+import logging
+
+from rhodecode.lib.utils import BasePasterCommand
+from string import strip
+from shutil import rmtree
+from rhodecode.model.repo import RepoModel
+from rhodecode.lib.utils import BasePasterCommand, load_rcextensions
+
+# fix rhodecode import
+from os.path import dirname as dn
+rc_path = dn(dn(dn(os.path.realpath(__file__))))
+sys.path.append(rc_path)
+
+
+class Command(BasePasterCommand):
+
+    max_args = 1
+    min_args = 1
+
+    usage = "CONFIG_FILE"
+    group_name = "RhodeCode"
+    takes_config_file = -1
+    parser = BasePasterCommand.standard_parser(verbose=True)
+    summary = "Creates or updates full text search index"
+
+    def command(self):
+        logging.config.fileConfig(self.path_to_ini_file)
+        #get SqlAlchemy session
+        self._init_session()
+        from pylons import config
+        index_location = config['index_dir']
+        load_rcextensions(config['here'])
+
+        repo_location = self.options.repo_location \
+            if self.options.repo_location else RepoModel().repos_path
+        repo_list = map(strip, self.options.repo_list.split(',')) \
+            if self.options.repo_list else None
+
+        repo_update_list = map(strip, self.options.repo_update_list.split(',')) \
+            if self.options.repo_update_list else None
+
+        #======================================================================
+        # WHOOSH DAEMON
+        #======================================================================
+        from rhodecode.lib.pidlock import LockHeld, DaemonLock
+        from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
+        try:
+            l = DaemonLock(file_=os.path.join(dn(dn(index_location)),
+                                              'make_index.lock'))
+            WhooshIndexingDaemon(index_location=index_location,
+                                 repo_location=repo_location,
+                                 repo_list=repo_list,
+                                 repo_update_list=repo_update_list)\
+                .run(full_index=self.options.full_index)
+            l.release()
+        except LockHeld:
+            sys.exit(1)
+
+    def update_parser(self):
+        self.parser.add_option('--repo-location',
+                          action='store',
+                          dest='repo_location',
+                          help="Specifies repositories location to index OPTIONAL",
+                          )
+        self.parser.add_option('--index-only',
+                          action='store',
+                          dest='repo_list',
+                          help="Specifies a comma separated list of repositores "
+                                "to build index on. If not given all repositories "
+                                "are scanned for indexing. OPTIONAL",
+                          )
+        self.parser.add_option('--update-only',
+                          action='store',
+                          dest='repo_update_list',
+                          help="Specifies a comma separated list of repositores "
+                                "to re-build index on. OPTIONAL",
+                          )
+        self.parser.add_option('-f',
+                          action='store_true',
+                          dest='full_index',
+                          help="Specifies that index should be made full i.e"
+                                " destroy old and build from scratch",
+                          default=False)