4 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index d2b22e1..820ed7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ nosetests.xml
 
 # Idea
 .idea
+*.iml
 
 # generic venvs
 .venv
diff --git a/README.md b/README.md
index 9921fbc..9f962b7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 python-barbicanclient
 =====================
 
-A python library for accessing the Barbican key management service.
+This is a client for the [Barbican](https://github.com/cloudkeep/barbican)
+Key Management API.  There is a Python library for accessing the API
+(`barbicanclient` module), and a command-line script (`keep`).
diff --git a/keep b/barbicanclient/keep.py
index 6a0e878..1f3ce99 100755..100644
--- a/keep
+++ b/barbicanclient/keep.py
@@ -166,7 +166,3 @@ class Keep:
 def main():
     k = Keep()
     k.execute()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/setup.py b/setup.py
index 6081cad..a47308e 100644
--- a/setup.py
+++ b/setup.py
@@ -55,5 +55,8 @@ setuptools.setup(
         'Programming Language :: Python :: 2.7',
         'Environment :: No Input/Output (Daemon)',
     ],
-    scripts = ['keep']
+    entry_points="""
+    [console_scripts]
+    keep = barbicanclient.keep:main
+    """
 )