diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -1,6 +1,6 @@
 ###################################################################################
 ###################################################################################
-## Kallithea config file generated with kallithea-config                         ##
+## Kallithea config file generated with kallithea-cli                            ##
 ##                                                                               ##
 ## The %(here)s variable will generally be replaced with the parent directory of ##
 ## this file. Other use of % must be escaped as %% .                             ##
diff --git a/kallithea/lib/paster_commands/template.ini.mako b/kallithea/lib/paster_commands/template.ini.mako
--- a/kallithea/lib/paster_commands/template.ini.mako
+++ b/kallithea/lib/paster_commands/template.ini.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%text>##</%text>#################################################################################
 <%text>##</%text>#################################################################################
-<%text>##</%text> Kallithea config file generated with kallithea-config ${'%-24s' % version    }##
+<%text>##</%text> Kallithea config file generated with kallithea-cli ${'%-27s' % version       }##
 <%text>##</%text>                                                                               ##
 <%text>##</%text> The %(here)s variable will generally be replaced with the parent directory of ##
 <%text>##</%text> this file. Other use of % must be escaped as %% .                             ##
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -153,7 +153,6 @@ setuptools.setup(
     [console_scripts]
     kallithea-api =    kallithea.bin.kallithea_api:main
     kallithea-gist =   kallithea.bin.kallithea_gist:main
-    kallithea-config = kallithea.bin.kallithea_config:main
     kallithea-cli =    kallithea.bin.kallithea_cli:cli
 
     [paste.app_factory]