diff --git a/docs/setup.rst b/docs/setup.rst
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -307,7 +307,7 @@ Celery. So for example setting `BROKER_H
 
 To start the Celery process, run::
 
-  gearbox celeryd -c my.ini
+  kallithea-cli celery-run -c my.ini
 
 Extra options to the Celery worker can be passed after ``--`` - see ``-- -h``
 for more info.
diff --git a/init.d/celeryd-upstart.conf b/init.d/celeryd-upstart.conf
--- a/init.d/celeryd-upstart.conf
+++ b/init.d/celeryd-upstart.conf
@@ -21,7 +21,7 @@ env USER=hg
 # env GROUP=hg
 
 script
-    COMMAND="/var/hg/.virtualenvs/kallithea/bin/gearbox celeryd -c $APPINI -- --pidfile=$PIDFILE"
+    COMMAND="/var/hg/.virtualenvs/kallithea/bin/kallithea-cli celery-run -c $APPINI -- --pidfile=$PIDFILE"
     if [ -z "$GROUP" ]; then
         exec sudo -u $USER $COMMAND
     else
diff --git a/kallithea/bin/kallithea_cli.py b/kallithea/bin/kallithea_cli.py
--- a/kallithea/bin/kallithea_cli.py
+++ b/kallithea/bin/kallithea_cli.py
@@ -16,6 +16,7 @@
 from kallithea.bin.kallithea_cli_base import cli
 
 # import commands (they will add themselves to the 'cli' object)
+import kallithea.bin.kallithea_cli_celery
 import kallithea.bin.kallithea_cli_config
 import kallithea.bin.kallithea_cli_db
 import kallithea.bin.kallithea_cli_extensions
diff --git a/kallithea/lib/paster_commands/celeryd.py b/kallithea/bin/kallithea_cli_celery.py
rename from kallithea/lib/paster_commands/celeryd.py
rename to kallithea/bin/kallithea_cli_celery.py
--- a/kallithea/lib/paster_commands/celeryd.py
+++ b/kallithea/bin/kallithea_cli_celery.py
@@ -1,38 +1,39 @@
 # -*- coding: utf-8 -*-
+# 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/>.
 
-import argparse
+import click
+import kallithea.bin.kallithea_cli_base as cli_base
 
 import kallithea
-from kallithea.lib.paster_commands.common import BasePasterCommand
-
-__all__ = ['Command']
-
-
-class Command(BasePasterCommand):
-    """Kallithea: Celery worker for asynchronous tasks"""
 
-    # Starts the celery worker using configuration from a paste.deploy
-    # configuration file.
+@cli_base.register_command(config_file_initialize_app=True)
+@click.argument('celery_args', nargs=-1)
+def celery_run(celery_args):
+    """Start Celery worker(s) for asynchronous tasks.
 
-    def take_action(self, args):
-        if not kallithea.CELERY_ON:
-            raise Exception('Please set use_celery = true in .ini config '
-                            'file before running celeryd')
+    This commands starts the Celery daemon which will spawn workers to handle
+    certain asynchronous tasks for Kallithea.
 
-        from kallithea.lib import celerypylons
-        cmd = celerypylons.worker.worker(celerypylons.app)
-
-        celery_args = args.celery_args
-        if '--' in celery_args:
-            celery_args.remove('--')
-
-        return cmd.run_from_argv('kallithea celery worker', celery_args)
+    Any extra arguments you pass to this command will be passed through to
+    Celery. Use '--' before such extra arguments to avoid options to be parsed
+    by this CLI command.
+    """
 
-    def get_parser(self, prog_name):
-        parser = super(Command, self).get_parser(prog_name)
+    if not kallithea.CELERY_ON:
+        raise Exception('Please set use_celery = true in .ini config '
+                        'file before running this command')
 
-        parser.add_argument('celery_args', nargs=argparse.REMAINDER,
-            help="Pass extra options to Celery after a '--' separator",
-            )
-
-        return parser
+    from kallithea.lib import celerypylons
+    cmd = celerypylons.worker.worker(celerypylons.app)
+    return cmd.run_from_argv('kallithea celery worker', celery_args)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -159,7 +159,6 @@ setuptools.setup(
     main = kallithea.config.middleware:make_app
 
     [gearbox.commands]
-    celeryd=kallithea.lib.paster_commands.celeryd:Command
     upgrade-db=kallithea.lib.dbmigrate:UpgradeDb
     """,
 )