diff --git a/bin/swift-recon b/bin/swift-recon
new file mode 100755
index 00000000..9a068f91
--- /dev/null
+++ b/bin/swift-recon
@@ -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 swift.cli.recon import main
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder
new file mode 100755
index 00000000..ed1b3843
--- /dev/null
+++ b/bin/swift-ring-builder
@@ -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 swift.cli.ringbuilder import main
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/setup.cfg b/setup.cfg
index 9f37ddbd..4fc28dc8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,7 +52,9 @@ scripts =
     bin/swift-oldies
     bin/swift-orphans
     bin/swift-proxy-server
+    bin/swift-recon
     bin/swift-recon-cron
+    bin/swift-ring-builder
     bin/swift-temp-url
 
 [entry_points]
@@ -88,10 +90,6 @@ paste.filter_factory =
     gatekeeper = swift.common.middleware.gatekeeper:filter_factory
     container_sync = swift.common.middleware.container_sync:filter_factory
 
-console_scripts =
-    swift-recon = swift.cli.recon:main
-    swift-ring-builder = swift.cli.ringbuilder:main
-
 [build_sphinx]
 all_files = 1
 build-dir = doc/build