diff --git a/bin/swift b/bin/swift
new file mode 100755
index 00000000..77102cfa
--- /dev/null
+++ b/bin/swift
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+# Copyright (c) 2014 Christian Schwede <christian.schwede@enovance.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import sys
+
+from swiftclient.shell import main
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/setup.cfg b/setup.cfg
index 1eaf9ff0..a7f8c2d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,13 +24,11 @@ setup-hooks =
 [files]
 packages =
     swiftclient
+scripts =
+    bin/swift
 data_files =
     share/man/man1 = doc/manpages/swift.1
 
-[entry_points]
-console_scripts =
-    swift = swiftclient.shell:main
-
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build