diff --git a/repoman-client/MANIFEST.in b/repoman-client/MANIFEST.in
index f3a6e54..6b5adbf 100644
--- a/repoman-client/MANIFEST.in
+++ b/repoman-client/MANIFEST.in
@@ -6,3 +6,5 @@ include repoman_client/repoman_client.py
 include repoman_client/repoutils.py
 include repoman_client/make_config.py
 include scripts/repoman
+recursive-include repoman_client/subcommands *.py
+
diff --git a/repoman-client/repoman_client/subcommands/__init__.py b/repoman-client/repoman_client/subcommands/__init__.py
index 609d687..10cdbfa 100644
--- a/repoman-client/repoman_client/subcommands/__init__.py
+++ b/repoman-client/repoman_client/subcommands/__init__.py
@@ -1,14 +1,4 @@
-"""
-Automagically find all subcommands in files in this directory.
 
-Usage:
-    from subcommands import *
-    OR
-    from subcommands import subcommands
-
-    In either case a list named `subcommands` will be imported.  This list
-    contains each of the subcommands that was automagically found in the folder.
-"""
 
 import os
 import sys
diff --git a/repoman-client/setup.py b/repoman-client/setup.py
index 95e780d..29eadfa 100755
--- a/repoman-client/setup.py
+++ b/repoman-client/setup.py
@@ -17,6 +17,8 @@
     url='http://github.com/hep-gc/repoman',
     install_requires=["simplejson","argparse"],
     packages=['repoman_client'],
-    scripts=['scripts/repoman']
+    scripts=['scripts/repoman'],
+    include_package_data=True,
+    zip_safe=False,
 )