diff --git a/pipenv/cli.py b/pipenv/cli.py
index aa7db6c4..0d44781d 100644
--- a/pipenv/cli.py
+++ b/pipenv/cli.py
@@ -8,6 +8,7 @@ import shutil
 import signal
 
 import click
+import click_completion
 import crayons
 import delegator
 import parse
@@ -33,6 +34,8 @@ if sys.version_info < (3, 3):
 else:
     from shutil import get_terminal_size
 
+# Enable shell completion.
+click_completion.init()
 
 # Disable warnings for Python 2.6.
 requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
diff --git a/setup.py b/setup.py
index ab2b721f..56bf4771 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@ required = [
     'crayons',
     'toml',
     'click',
+    'click-completion',
     'pip',
     'parse',
     'virtualenv',