diff --git a/Makefile b/Makefile
index 4e8b3e71d5cde8c53e21876d47ba37a2ce8b9aad..1a71f2b33f6e4be1ec6e3796f0b9c61841a12f26 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ## Makefile
 
-.PHONY: all tar deb clean cleanbuild buildd
+.PHONY: all tar deb clean cleanbuild buildd dsc
 
 NAME=installsystems
 VERSION=$(shell sed -rn 's/version = "([^"]+)"/\1/p' installsystems/__init__.py)
@@ -26,7 +26,7 @@ buildd: dsc
 	chmod 644 $(BUILD_DIR)/$(NAME)_*.dsc $(BUILD_DIR)/$(NAME)_*.gz
 	scp $(BUILD_DIR)/$(NAME)_*.dsc $(BUILD_DIR)/$(NAME)_*.gz incoming@buildd.fr.lan:sid
 
-clean: clean_build
+clean: cleanbuild
 
 cleanbuild:
 	-rm -rf  $(BUILD_DIR)
diff --git a/debian/changelog b/debian/changelog
index d7c573bec2791093a941666c4c746ca5a78cbda5..62318e592ac68b4a56ae99e1914215f7d0a05544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-installsystems (1) unstable; urgency=low
+installsystems (1-dev) unstable; urgency=low
 
-  * Initial release.
+  * version 1 dev package.
 
  -- Sebastien Luttringer <sebastien.luttringer@smartjog.com> Wed, 08 Jun 2011 12:30:02 +0200
diff --git a/debian/control b/debian/control
index f2077d7a47d6c1acd58e25465fb8ba7e63e5d2b5..0d8f772bc2cfb3c1e6e98d34bb2d8cb5a20f2057 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: installsystems
 Section: python
 Priority: optional
 Maintainer: Sebastien Luttringer <sebastien.luttringer@smartjog.com>
-Build-Depends: debhelper (>= 7), python-central (>= 0.6),  cdbs (>= 0.4.50), python-setuptools, python (>=2.6 << 3.0) 
+Build-Depends: debhelper (>= 7), python-central (>= 0.6),  cdbs (>= 0.4.50), python-setuptools, python (>=2.6)
 XS-Python-Version: >= 2.6
 Standards-Version: 3.9.1
 
diff --git a/debian/isimage.install b/debian/isimage.install
index b277c44c6985d95e2b90287022e5352b52fd2d2d..2022c11bdc0d46dcd7939f7ea4c97a4465c8510c 100644
--- a/debian/isimage.install
+++ b/debian/isimage.install
@@ -1 +1 @@
-/bin/isimage
+usr/bin/isimage
diff --git a/debian/isinstall.install b/debian/isinstall.install
index 841238975a023ebd88cc024577eabb2a4ff4cf73..ab957bc1dd2323d37dac471c174e3900e370d7ce 100644
--- a/debian/isinstall.install
+++ b/debian/isinstall.install
@@ -1 +1 @@
-/bin/isinstall
+usr/bin/isinstall
diff --git a/debian/isrepo.install b/debian/isrepo.install
index 0efbe771af9376842967f5192c194bb3cdf03d4a..59c93da27820003d977bcda41068dbe9350fc3cf 100644
--- a/debian/isrepo.install
+++ b/debian/isrepo.install
@@ -1 +1 @@
-/bin/isrepo
+usr/bin/isrepo
diff --git a/debian/python-installsystems.install b/debian/python-installsystems.install
new file mode 100644
index 0000000000000000000000000000000000000000..68457717bd8efb8ba6291fca9d862dd5eb0d3b1e
--- /dev/null
+++ b/debian/python-installsystems.install
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/rules b/debian/rules
index d2f5398f7813ae1deeffccfe81ed370ef0cff2bb..14ed5aee326234c17b2b19c6ba248df7858bc185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 
-PYTHON_PACKAGES := installsystems
+PYTHON_PACKAGES := isinstall isimage isrepo python-installsystems
 
 $(patsubst %,binary-install/%,$(PYTHON_PACKAGES)) ::
 	dh_pycentral -p$(cdbs_curpkg)
diff --git a/setup.py b/setup.py
index d00c6bf11a7f9c006847f03bc9e2e7fd992d01e8..6de4841fb8f499ba56675e61dc9081079ceb1f6e 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ setup(
     author='Sebastien Luttringer',
     author_email='sebastien.luttringer@smartjog.com',
     license='GPL2', 
-    packages=[ 'installsystems'],
+    packages=[ 'installsystems' ],
     scripts=['bin/isrepo', 'bin/isinstall', 'bin/isimage'],
     classifiers=[
         'Operating System :: Unix',