diff --git a/bin/melange b/bin/melange-server
similarity index 100%
rename from bin/melange
rename to bin/melange-server
diff --git a/melange/__init__.py b/melange/__init__.py
index f077c6a1..75a5f221 100644
--- a/melange/__init__.py
+++ b/melange/__init__.py
@@ -16,8 +16,13 @@
 #    under the License.
 
 import gettext
+import pkgutil
 import os
 
+
+__path__ = pkgutil.extend_path(__path__, __name__)
+
+
 gettext.install('melange', unicode=1)
 
 
diff --git a/setup.py b/setup.py
index 176e8218..d12951b8 100644
--- a/setup.py
+++ b/setup.py
@@ -123,7 +123,7 @@ setup(name='melange',
           'Programming Language :: Python :: 2.6',
           'Environment :: No Input/Output (Daemon)',
       ],
-      scripts=['bin/melange',
+      scripts=['bin/melange-server',
                'bin/melange-manage',
                'bin/melange-delete-deallocated-ips',
                ],