diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b94054e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,91 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# IPython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# dotenv
-.env
-
-# virtualenv
-venv/
-ENV/
-
-# Spyder project settings
-.spyderproject
-
-# Rope project settings
-.ropeproject
-
-.idea
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..499fd8d
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: click-completion
+Version: 0.5.2
+Summary: Fish, Bash, Zsh and PowerShell completion for Click
+Home-page: https://github.com/click-contrib/click-completion
+Author: Gaëtan Lehmann
+Author-email: gaetan.lehmann@gmail.com
+License: MIT
+Platform: UNKNOWN
+License-File: LICENSE
+
+UNKNOWN
+
diff --git a/click-completion.asciicast b/click-completion.asciicast
deleted file mode 100644
index f605ed1..0000000
--- a/click-completion.asciicast
+++ /dev/null
@@ -1,366 +0,0 @@
-{
-  "height": 26,
-  "stdout": [
-    [
-      0.043954,
-      "\u001b]0;click-completion\u0007"
-    ],
-    [
-      0.001408,
-      "\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.003152,
-      "Welcome to fish, the friendly interactive shell\r\nType \u001b[32mhelp\u001b[30m\u001b(B\u001b[m for instructions on how to use fish\r\n"
-    ],
-    [
-      0.00383,
-      "\u001b[?2004h"
-    ],
-    [
-      0.002053,
-      "\u001b]7;file://L1704-00265/home/glehmann/src/click-completion\u0007"
-    ],
-    [
-      0.005638,
-      "\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      2e-05,
-      "\u001b[2m⏎\u001b(B\u001b[m                                                                                               \r⏎ \r\u001b[2K"
-    ],
-    [
-      0.000358,
-      "glehmann@L1704-00265 \u001b[32m~/s/click-completion\u001b[30m\u001b(B\u001b[m> \u001b[K"
-    ],
-    [
-      1.130217,
-      "click-completion-command"
-    ],
-    [
-      0.000988,
-      "\u001b[30m\u001b(B\u001b[m\r"
-    ],
-    [
-      9e-05,
-      "glehmann@L1704-00265 \u001b[32m~/s/click-completion\u001b[30m\u001b(B\u001b[m> click-completion-command\u001b[K"
-    ],
-    [
-      8.9e-05,
-      "\u001b[24D\u001b[38;2;0;95;215mclick-completion-command\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.001629,
-      "\u001b[38;2;85;85;85m install bash \u001b[14D\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      1.032403,
-      "\u001b[38;2;0;95;215m \u001b[38;2;85;85;85minstall bash \u001b[13D\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.0002,
-      "\b \u001b[38;2;85;85;85minstall bash \u001b[13D\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.824121,
-      "\r\ninstall       (\u001b[38;2;85;85;85mInstall the click-completion-command...\u001b[30m\u001b(B\u001b[m)\r\nshow  (\u001b[38;2;85;85;85mShow the click-completion-command completion...\u001b[30m\u001b(B\u001b[m)\u001b[A\u001b[A\u001b[13C"
-    ],
-    [
-      0.716255,
-      "install \u001b[38;2;85;85;85mbash \r\n\u001b[1m\u001b[30m\u001b(B\u001b[m\u001b[45minstall       (\u001b[38;2;85;85;85mInstall the click-completion-command...\u001b[30m\u001b(B\u001b[m\u001b[45m)\u001b[A\u001b[21C\u001b(B\u001b[m\u001b[30m\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.000268,
-      "\b\b\b\b\b\b\b\b\u001b[38;2;0;175;255minstall\u001b[30m\u001b(B\u001b[m \u001b[38;2;85;85;85mbash \b\b\b\b\b\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.535347,
-      "\r\n\u001b[K\r\n\u001b[K\u001b[A\u001b[A\u001b[76C"
-    ],
-    [
-      0.576608,
-      "\r\nbash          (\u001b[38;2;85;85;85mBourne again shell\u001b[30m\u001b(B\u001b[m)  powershell  (\u001b[38;2;85;85;85mWindows PowerShell\u001b[30m\u001b(B\u001b[m)\r\nfish  (\u001b[38;2;85;85;85mFriendly interactive shell\u001b[30m\u001b(B\u001b[m)  zsh                    (\u001b[38;2;85;85;85mZ shell\u001b[30m\u001b(B\u001b[m)\u001b[A\u001b[A\u001b[8C"
-    ],
-    [
-      1.488487,
-      "bash \r\n\u001b[1m\u001b[45mbash          (\u001b[38;2;85;85;85mBourne again shell\u001b[30m\u001b(B\u001b[m\u001b[45m)\u001b(B\u001b[m\u001b[30m\u001b[30m\u001b(B\u001b[m  powershell  (\u001b[38;2;85;85;85mWindows PowerShell\u001b[30m\u001b(B\u001b[m)\u001b[A\u001b[13C"
-    ],
-    [
-      0.000217,
-      "\b\b\b\b\b\u001b[38;2;0;175;255mbash\u001b[30m\u001b(B\u001b[m "
-    ],
-    [
-      0.542287,
-      "\r\n\u001b[K\r\n\u001b[K\u001b[A\u001b[A\u001b[81C"
-    ],
-    [
-      0.735563,
-      "\r\n\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.000118,
-      "\u001b[?2004l"
-    ],
-    [
-      0.000127,
-      "\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.060751,
-      "bash completion installed in /home/glehmann/.bash_completion\r\n"
-    ],
-    [
-      0.01473,
-      "\u001b]0;click-completion\u0007"
-    ],
-    [
-      0.001496,
-      "\u001b[?2004h"
-    ],
-    [
-      0.001082,
-      "\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      2e-05,
-      "\u001b[2m⏎\u001b(B\u001b[m                                                                                               \r⏎ \r\u001b[2K"
-    ],
-    [
-      1.9e-05,
-      "glehmann@L1704-00265 \u001b[32m~/s/click-completion\u001b[30m\u001b(B\u001b[m> \u001b[K"
-    ],
-    [
-      1.218768,
-      "b"
-    ],
-    [
-      0.000192,
-      "\b\u001b[31m\u001b[1mb\u001b(B\u001b[m"
-    ],
-    [
-      0.000189,
-      "\u001b[38;2;85;85;85mash\b\b\b\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.222564,
-      "\u001b[31m\u001b[1ma\u001b(B\u001b[m\u001b[38;2;85;85;85msh\b\b\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.071928,
-      "\u001b[31m\u001b[1ms\u001b(B\u001b[m\u001b[38;2;85;85;85mh\b\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.176736,
-      "\u001b[31m\u001b[1mh\u001b(B\u001b[m"
-    ],
-    [
-      0.000399,
-      "\b\b\b\b\u001b[38;2;0;95;215mbash\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.319754,
-      "\r\n\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.000219,
-      "\u001b[?2004l"
-    ],
-    [
-      0.000145,
-      "\u001b[30m\u001b(B\u001b[m"
-    ],
-    [
-      0.051067,
-      "\u001b]0;glehmann@L1704-00265: ~/src/click-completion\u0007\u001b[01;32mglehmann@L1704-00265\u001b[00m:\u001b[01;34m~/src/click-completion\u001b[00m$ "
-    ],
-    [
-      1.068829,
-      "click-completion-command"
-    ],
-    [
-      0.567348,
-      " "
-    ],
-    [
-      0.240724,
-      "\u0007"
-    ],
-    [
-      0.508252,
-      "\r\ninstall  show     \r\n\u001b]0;glehmann@L1704-00265: ~/src/click-completion\u0007\u001b[01;32mglehmann@L1704-00265\u001b[00m:\u001b[01;34m~/src/click-completion\u001b[00m$ click-completion-command "
-    ],
-    [
-      1.051105,
-      "i"
-    ],
-    [
-      1.095134,
-      "nstall "
-    ],
-    [
-      1.382431,
-      "\u0007"
-    ],
-    [
-      0.535865,
-      "\r\nbash        fish        powershell  zsh         \r\n\u001b]0;glehmann@L1704-00265: ~/src/click-completion\u0007\u001b[01;32mglehmann@L1704-00265\u001b[00m:\u001b[01;34m~/src/click-completion\u001b[00m$ click-completion-command install "
-    ],
-    [
-      0.858617,
-      "z"
-    ],
-    [
-      0.165233,
-      "sh "
-    ],
-    [
-      0.826693,
-      "\r\n"
-    ],
-    [
-      0.081266,
-      "zsh completion installed in /home/glehmann/.zshrc\r\n"
-    ],
-    [
-      0.00917,
-      "\u001b]0;glehmann@L1704-00265: ~/src/click-completion\u0007\u001b[01;32mglehmann@L1704-00265\u001b[00m:\u001b[01;34m~/src/click-completion\u001b[00m$ "
-    ],
-    [
-      1.053024,
-      "z"
-    ],
-    [
-      0.304552,
-      "s"
-    ],
-    [
-      0.32801,
-      "h"
-    ],
-    [
-      0.296039,
-      "\r\n"
-    ],
-    [
-      0.235335,
-      "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m                                                                                               \r \r"
-    ],
-    [
-      0.001023,
-      "\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b[44mglehmann@L1704-00265\u001b[49m \u001b[1m\u001b[32m~/src/click-completion\r\n\r\u001b[37m % \u001b[0m\u001b[37m\u001b[39m\u001b[49m\u001b[K"
-    ],
-    [
-      4.6e-05,
-      "\u001b[?1h\u001b=\u001b[?2004h"
-    ],
-    [
-      2.33259,
-      "\u001b[7mclick-completion-command\u001b[27m"
-    ],
-    [
-      1.505161,
-      "\u001b[24D\u001b[27mc\u001b[27ml\u001b[27mi\u001b[27mc\u001b[27mk\u001b[27m-\u001b[27mc\u001b[27mo\u001b[27mm\u001b[27mp\u001b[27ml\u001b[27me\u001b[27mt\u001b[27mi\u001b[27mo\u001b[27mn\u001b[27m-\u001b[27mc\u001b[27mo\u001b[27mm\u001b[27mm\u001b[27ma\u001b[27mn\u001b[27md\u001b[1m \u001b[0m"
-    ],
-    [
-      1.162655,
-      "\u0007\b\u001b[0m \r\r\n"
-    ],
-    [
-      1.7e-05,
-      "\u001b[0minstall  -- Install the click-completion-command...\r\n\u001b[Jshow     -- Show the click-completion-command completion...\u001b[J\u001b[A\u001b[A\u001b[0m\u001b[27m\u001b[24m\u001b[0m\u001b[39m\u001b[49m\r\u001b[3Cclick-completion-command\u001b[K\u001b[0m\u001b[39m\u001b[49m\u001b[1C"
-    ],
-    [
-      1.009869,
-      "\u0007install"
-    ],
-    [
-      1.177475,
-      " "
-    ],
-    [
-      0.438359,
-      "\u0007\r\r\n\u001b[J"
-    ],
-    [
-      3.4e-05,
-      "\u001b[0mbash        -- Bourne again shell\r\nfish        -- Friendly interactive shell\r\npowershell  -- Windows PowerShell\r\n\u001b[Jzsh         -- Z shell\u001b[J\u001b[4A\u001b[0m\u001b[27m\u001b[24m\u001b[0m\u001b[39m\u001b[49m\r\u001b[3Cclick-completion-command install\u001b[K\u001b[0m\u001b[39m\u001b[49m\u001b[1C"
-    ],
-    [
-      1.15356,
-      "f"
-    ],
-    [
-      0.462914,
-      "ish\u001b[1m \u001b[0m"
-    ],
-    [
-      0.760856,
-      "\b\u001b[0m \b"
-    ],
-    [
-      0.000114,
-      "\u001b[?1l\u001b>"
-    ],
-    [
-      8.7e-05,
-      "\u001b[?2004l\r\r\n\u001b[J"
-    ],
-    [
-      0.083645,
-      "fish completion installed in /home/glehmann/.config/fish/completions/click-completion-command.fish\r\n"
-    ],
-    [
-      0.007134,
-      "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m                                                                                               \r \r"
-    ],
-    [
-      0.00104,
-      "\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b[44mglehmann@L1704-00265\u001b[49m \u001b[1m\u001b[32m~/src/click-completion\r\n\r\u001b[37m % \u001b[0m\u001b[37m\u001b[39m\u001b[49m\u001b[K\u001b[?1h\u001b="
-    ],
-    [
-      5.1e-05,
-      "\u001b[?2004h"
-    ],
-    [
-      1.588077,
-      "f"
-    ],
-    [
-      0.103704,
-      "\bfi"
-    ],
-    [
-      0.176201,
-      "s"
-    ],
-    [
-      0.199877,
-      "h"
-    ],
-    [
-      0.344228,
-      "\u001b[?1l\u001b>"
-    ],
-    [
-      5.7e-05,
-      "\u001b[?2004l\r\r\n"
-    ],
-    [
-      0.073316,
-      "\u001b]0;click-completion\u0007"
-    ],
-    [
-      0.001265,
-      "\u001b[30m\u001b(B\u001b[m"
-    ]
-  ],
-  "version": 1,
-  "env": {
-    "TERM": "xterm-256color",
-    "SHELL": "/usr/bin/fish"
-  },
-  "title": null,
-  "command": null,
-  "width": 96,
-  "duration": 37.064273
-}
diff --git a/click_completion.egg-info/PKG-INFO b/click_completion.egg-info/PKG-INFO
new file mode 100644
index 0000000..499fd8d
--- /dev/null
+++ b/click_completion.egg-info/PKG-INFO
@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: click-completion
+Version: 0.5.2
+Summary: Fish, Bash, Zsh and PowerShell completion for Click
+Home-page: https://github.com/click-contrib/click-completion
+Author: Gaëtan Lehmann
+Author-email: gaetan.lehmann@gmail.com
+License: MIT
+Platform: UNKNOWN
+License-File: LICENSE
+
+UNKNOWN
+
diff --git a/click_completion.egg-info/SOURCES.txt b/click_completion.egg-info/SOURCES.txt
new file mode 100644
index 0000000..7d13929
--- /dev/null
+++ b/click_completion.egg-info/SOURCES.txt
@@ -0,0 +1,20 @@
+LICENSE
+MANIFEST.in
+README.md
+setup.cfg
+setup.py
+click_completion/__init__.py
+click_completion/bash-click8.j2
+click_completion/bash.j2
+click_completion/core.py
+click_completion/fish.j2
+click_completion/lib.py
+click_completion/patch.py
+click_completion/powershell.j2
+click_completion/zsh-click8.j2
+click_completion/zsh.j2
+click_completion.egg-info/PKG-INFO
+click_completion.egg-info/SOURCES.txt
+click_completion.egg-info/dependency_links.txt
+click_completion.egg-info/requires.txt
+click_completion.egg-info/top_level.txt
\ No newline at end of file
diff --git a/click_completion.egg-info/dependency_links.txt b/click_completion.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/click_completion.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/click_completion.egg-info/requires.txt b/click_completion.egg-info/requires.txt
new file mode 100644
index 0000000..816c0d4
--- /dev/null
+++ b/click_completion.egg-info/requires.txt
@@ -0,0 +1,7 @@
+click
+jinja2
+shellingham
+six
+
+[:python_version < "3"]
+enum34
diff --git a/click_completion.egg-info/top_level.txt b/click_completion.egg-info/top_level.txt
new file mode 100644
index 0000000..d45f3cd
--- /dev/null
+++ b/click_completion.egg-info/top_level.txt
@@ -0,0 +1 @@
+click_completion
diff --git a/click_completion/bash-click8.j2 b/click_completion/bash-click8.j2
new file mode 100644
index 0000000..2a0e85a
--- /dev/null
+++ b/click_completion/bash-click8.j2
@@ -0,0 +1 @@
+eval "$(_{{prog_name.upper()}}_COMPLETE=bash_source {{prog_name}})"
diff --git a/click_completion/core.py b/click_completion/core.py
index 867085e..f6a6a4a 100644
--- a/click_completion/core.py
+++ b/click_completion/core.py
@@ -3,6 +3,7 @@
 
 from __future__ import print_function, absolute_import
 
+import distutils.version
 import os
 import re
 import shlex
@@ -25,7 +26,7 @@ def startswith(string, incomplete):
     string : str
         The string to check
     incomplete : str
-        The incomplete string to compare to the begining of string
+        The incomplete string to compare to the beginning of string
 
     Returns
     -------
@@ -42,7 +43,7 @@ class CompletionConfiguration(object):
     ----------
 
     complete_options : bool
-        Wether to complete the options or not. By default, the options are only completed after the user has entered
+        Whether to complete the options or not. By default, the options are only completed after the user has entered
         a first dash '-'. Change this value to True to always complete the options, even without first typing any
         character.
     match_incomplete : func
@@ -303,7 +304,15 @@ def get_code(shell=None, prog_name=None, env_name=None, extra_env=None):
     env_name = env_name or '_%s_COMPLETE' % prog_name.upper().replace('-', '_')
     extra_env = extra_env if extra_env else {}
     env = Environment(loader=FileSystemLoader(os.path.dirname(__file__)))
-    template = env.get_template('%s.j2' % shell.name)
+
+    click_ver = distutils.version.StrictVersion(click.__version__)
+    click8_ver = distutils.version.StrictVersion('8.0.0')
+    if click_ver >= click8_ver:
+        template_name = '%s-click8.j2'
+    else:
+        template_name = '%s.j2'
+    template = env.get_template(template_name % shell.name)
+
     return template.render(prog_name=prog_name, complete_var=env_name, extra_env=extra_env)
 
 
@@ -345,7 +354,11 @@ def install(shell=None, prog_name=None, env_name=None, path=None, append=None, e
         path = path or os.path.expanduser('~') + '/.bash_completion'
         mode = mode or 'a'
     elif shell == 'zsh':
-        path = path or os.path.expanduser('~') + '/.zshrc'
+        zdotdir = os.getenv('ZDOTDIR')
+        if zdotdir is None:
+            path = path or os.path.expanduser('~') + '/.zshrc'
+        else:
+            path = path or zdotdir + '/.zshrc'
         mode = mode or 'a'
     elif shell == 'powershell':
         subprocess.check_call(['powershell', 'Set-ExecutionPolicy Unrestricted -Scope CurrentUser'])
diff --git a/click_completion/zsh-click8.j2 b/click_completion/zsh-click8.j2
new file mode 100644
index 0000000..e2d07d9
--- /dev/null
+++ b/click_completion/zsh-click8.j2
@@ -0,0 +1,7 @@
+#compdef {{prog_name}}
+_{{prog_name}}() {
+  eval "$(_{{prog_name.upper()}}_COMPLETE=zsh_source {{prog_name}})"
+}
+if [[ "$(basename -- ${(%):-%x})" != "_{{prog_name}}" ]]; then
+  compdef _{{prog_name}} {{prog_name}}
+fi
diff --git a/click_completion/zsh.j2 b/click_completion/zsh.j2
index ac79661..3a7a8f1 100644
--- a/click_completion/zsh.j2
+++ b/click_completion/zsh.j2
@@ -2,6 +2,8 @@
 _{{prog_name}}() {
   eval $(env COMMANDLINE="${words[1,$CURRENT]}" {{complete_var}}=complete-zsh {% for k, v in extra_env.items() %} {{k}}={{v}}{% endfor %} {{prog_name}})
 }
-if [[ "$(basename -- ${(%):-%x})" != "_{{prog_name}}" ]]; then
+if [[ $zsh_eval_context == *func ]]; then
+  _{{prog_name}} "$@"
+else
   compdef _{{prog_name}} {{prog_name}}
 fi
diff --git a/examples/click-completion-callback b/examples/click-completion-callback
deleted file mode 100755
index 15dd29d..0000000
--- a/examples/click-completion-callback
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-
-from __future__ import print_function, absolute_import
-
-import click_completion
-
-import click
-
-import click_completion.core
-
-click_completion.init()
-
-
-def install_callback(ctx, attr, value):
-    if not value or ctx.resilient_parsing:
-        return value
-    shell, path = click_completion.core.install()
-    click.echo('%s completion installed in %s' % (shell, path))
-    exit(0)
-
-
-@click.command()
-@click.option('--install', is_flag=True, callback=install_callback, expose_value=False,
-              help="Install completion for the current shell.")
-@click.option('--upper/--lower', default=None, help="Change text to upper or lower case")
-@click.argument('args', nargs=-1)
-def echo(upper, args):
-    """just print the command line arguments"""
-    if upper:
-        args = [arg.upper() for arg in args]
-    elif upper is not None:
-        args = [arg.lower() for arg in args]
-    click.echo(' '.join(args))
-
-
-if __name__ == "__main__":
-    echo()
diff --git a/examples/click-completion-command b/examples/click-completion-command
deleted file mode 100755
index 8250279..0000000
--- a/examples/click-completion-command
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-
-from __future__ import print_function, absolute_import
-
-import click_completion
-import os
-
-import click
-
-import click_completion.core
-
-
-def custom_startswith(string, incomplete):
-    """A custom completion matching that supports case insensitive matching"""
-    if os.environ.get('_CLICK_COMPLETION_COMMAND_CASE_INSENSITIVE_COMPLETE'):
-        string = string.lower()
-        incomplete = incomplete.lower()
-    return string.startswith(incomplete)
-
-
-click_completion.core.startswith = custom_startswith
-click_completion.init()
-
-
-cmd_help = """Shell completion for click-completion-command
-
-Available shell types:
-
-\b
-  %s
-
-Default type: auto
-""" % "\n  ".join('{:<12} {}'.format(k, click_completion.core.shells[k]) for k in sorted(
-    click_completion.core.shells.keys()))
-
-
-@click.group(help=cmd_help)
-def completion():
-    pass
-
-
-@completion.command()
-@click.option('-i', '--case-insensitive/--no-case-insensitive', help="Case insensitive completion")
-@click.argument('shell', required=False, type=click_completion.DocumentedChoice(click_completion.core.shells))
-def show(shell, case_insensitive):
-    """Show the click-completion-command completion code"""
-    extra_env = {'_CLICK_COMPLETION_COMMAND_CASE_INSENSITIVE_COMPLETE': 'ON'} if case_insensitive else {}
-    click.echo(click_completion.core.get_code(shell, extra_env=extra_env))
-
-
-@completion.command()
-@click.option('--append/--overwrite', help="Append the completion code to the file", default=None)
-@click.option('-i', '--case-insensitive/--no-case-insensitive', help="Case insensitive completion")
-@click.argument('shell', required=False, type=click_completion.DocumentedChoice(click_completion.core.shells))
-@click.argument('path', required=False)
-def install(append, case_insensitive, shell, path):
-    """Install the click-completion-command completion"""
-    extra_env = {'_CLICK_COMPLETION_COMMAND_CASE_INSENSITIVE_COMPLETE': 'ON'} if case_insensitive else {}
-    shell, path = click_completion.core.install(shell=shell, path=path, append=append, extra_env=extra_env)
-    click.echo('%s completion installed in %s' % (shell, path))
-
-
-if __name__ == "__main__":
-    completion()
diff --git a/setup.cfg b/setup.cfg
index b88034e..9f88734 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,7 @@
 [metadata]
 description-file = README.md
+
+[egg_info]
+tag_build = 
+tag_date = 0
+