diff --git a/ipa b/ipa
index 9ef356868..d6e01a228 100755
--- a/ipa
+++ b/ipa
@@ -24,8 +24,7 @@ Command Line Interface for IPA administration.
 
 The CLI functionality is implemented in ipalib/cli.py
 """
-
-from ipalib import api, cli
+from ipaclient.__main__ import main
 
 if __name__ == '__main__':
-    cli.run(api)
+    main()
diff --git a/ipaclient/__main__.py b/ipaclient/__main__.py
new file mode 100644
index 000000000..65c706fcf
--- /dev/null
+++ b/ipaclient/__main__.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2017  FreeIPA Contributors see COPYING for license
+"""
+Command Line Interface for IPA administration.
+
+The CLI functionality is implemented in ipalib/cli.py
+"""
+from ipalib import api, cli
+
+
+def main():
+    cli.run(api)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/ipaclient/setup.py b/ipaclient/setup.py
index f5be7ea61..ccb539667 100644
--- a/ipaclient/setup.py
+++ b/ipaclient/setup.py
@@ -31,7 +31,6 @@ if __name__ == '__main__':
     ipasetup(
         name="ipaclient",
         doc=__doc__,
-        scripts=['../ipa'],
         package_dir={'ipaclient': ''},
         packages=[
             "ipaclient",
@@ -60,6 +59,11 @@ if __name__ == '__main__':
             "qrcode",
             "six",
         ],
+        entry_points={
+            'console_scripts': [
+                'ipa = ipaclient.__main__:main'
+            ]
+        },
         extras_require={
             "install": ["ipaplatform"],
             "otptoken_yubikey": ["yubico", "usb"]