diff --git a/novaclient/shell.py b/novaclient/shell.py
index 5c91b890b..d573ae87a 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -134,6 +134,10 @@ class OpenStackComputeShell(object):
         extensions = []
         for ext_path in glob.iglob(ext_glob):
             name = os.path.basename(ext_path)[:-3]
+
+            if name == "__init__":
+                continue
+
             ext_module = imp.load_source(name, ext_path)
 
             # Extract Manager class
diff --git a/novaclient/v1_1/contrib/__init__.py b/novaclient/v1_1/contrib/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/setup.py b/setup.py
index a272211fa..c04d7b9f6 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setuptools.setup(
     long_description=read_file("README.rst"),
     license="Apache License, Version 2.0",
     url="https://github.com/openstack/python-novaclient",
-    packages=["novaclient", "novaclient.v1_0", "novaclient.v1_1"],
+    packages=["novaclient", "novaclient.v1_1", "novaclient.v1_1.contrib"],
     install_requires=requirements,
     tests_require=["nose", "mock"],
     test_suite="nose.collector",