diff --git a/tools/debian/imp-dev.install b/tools/debian/imp-dev.install
index b1b5e720c9..1089d0b497 100644
--- a/tools/debian/imp-dev.install
+++ b/tools/debian/imp-dev.install
@@ -1,3 +1,7 @@
 usr/lib/*/libTAU.so
 usr/lib/*/libimp*.so
+usr/lib/*/cmake/
 usr/include/*
+usr/share/IMP/build_info
+usr/share/IMP/swig
+usr/share/IMP/tools
diff --git a/tools/debian/imp.install b/tools/debian/imp.install
index 65022d3cc6..98f01e60fe 100644
--- a/tools/debian/imp.install
+++ b/tools/debian/imp.install
@@ -3,5 +3,4 @@ usr/lib/*/libimp*.so.*
 usr/lib/*/libRMF*.so
 usr/lib/python2*/dist-packages/*
 usr/bin/*
-usr/share/IMP/*
 usr/share/doc/imp/*
diff --git a/tools/debian/make-package.sh b/tools/debian/make-package.sh
index 580f274450..8c360739eb 100755
--- a/tools/debian/make-package.sh
+++ b/tools/debian/make-package.sh
@@ -20,6 +20,8 @@ imp_dir_name=`basename ${TOP_DIR}`
 cd ${TOP_DIR} || exit 1
 rm -rf debian
 cp -r tools/debian/ . || exit 1
+# Add all module data directories to imp.install
+(cd modules && for m in *; do if test -d $m/data; then echo usr/share/IMP/$m; fi; done) >> ${TOP_DIR}/debian/imp.install
 rm debian/make-package.sh || exit 1
 perl -pi -e "s/\@VERSION\@/$VERSION/; s/\@DATE\@/$DATE/; s/\@CODENAME\@/$CODENAME/;" debian/changelog  || exit 1
 if [ "${CODENAME}" = "precise" ]; then