diff --git a/mkdocs/mkdocs b/mkdocs/main.py
similarity index 87%
rename from mkdocs/mkdocs
rename to mkdocs/main.py
index cc60c980..adc554ae 100755
--- a/mkdocs/mkdocs
+++ b/mkdocs/main.py
@@ -39,7 +39,16 @@ def main(cmd, args, options=None):
     else:
         print('mkdocs [help|new|build|serve|gh-deploy] {options}')
 
-if __name__ == '__main__':
+def run_main():
+    """
+    Invokes main() with the contents of sys.argv
+
+    This is a separate function so it can be invoked
+    by a setuptools console_script.
+    """
     cmd = sys.argv[1] if len(sys.argv) >= 2 else None
     opts = [arg_to_option(arg) for arg in sys.argv[2:] if arg.startswith('--')]
     main(cmd, args=sys.argv[2:], options=dict(opts))
+
+if __name__ == '__main__':
+    run_main()
diff --git a/setup.py b/setup.py
index 51f4e14e..07ca37f8 100755
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,11 @@ setup(
     packages=get_packages(package),
     package_data=get_package_data(package),
     install_requires=install_requires,
-    scripts=['mkdocs/mkdocs'],
+    entry_points={
+        'console_scripts': [
+            'mkdocs = mkdocs.main:run_main',
+            ],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',