diff --git a/MANIFEST.in b/MANIFEST.in
index c14e739..39378ac 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
-recursive-include debian  callcontrol.init callcontrol.manpages callcontrol.postinst changelog compat control copyright dirs docs pycompat pyversions rules
+recursive-include debian  callcontrol.init callcontrol.manpages changelog compat control copyright dirs docs pycompat pyversions rules
+recursive-include debian/source format
 recursive-include doc/man *.[1-9]
 prune debian/tmp
 prune debian/callcontrol
 include INSTALL LICENSE MANIFEST.in config.ini.sample changelog
diff --git a/debian/control b/debian/control
index 8863ff3..89c23c8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,22 @@
 Source: callcontrol
 Section: net
 Priority: optional
 Maintainer: Lucian Stanescu <luci@ag-projects.com>
 Uploaders: Dan Pascu <dan@ag-projects.com>, Adrian Georgescu <ag@ag-projects.com>, Saul Ibarra <saul@ag-projects.com>
-Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.0), python (>= 2.5.0), python-support
+Build-Depends: debhelper (>= 7.3.5), python (>= 2.5)
 Standards-Version: 3.9.1
 
 Package: callcontrol
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-application (>= 1.1.5), python-twisted-core, python-sqlobject
 Description: Call Control prepaid application for OpenSIPS
  Call Control is a prepaid application that can be used together with
  OpenSIPS call_control module and CDRTool rating engine to limit the duration
  of SIP sessions based on a prepaid balance. It can also be used to limit the
  duration of any session to a predefined maximum value without debiting a
  balance.
  .
  Call Control achieves this by maintaining a timer for each session and
  sending BYE messages to both SIP end-points, if the session exceeds its
  maximum session limit or if the Call Control receives a command to
  forcefully close the call from outside.
diff --git a/debian/rules b/debian/rules
index 28efc54..b5032ef 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
-  
-DEB_PYTHON_SYSTEM=pysupport
-DEB_COMPRESS_EXCLUDE := .py
 
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+#export DH_VERBOSE=1
 
-clean::
-	-rm -rf build dist MANIFEST
+%:
+	dh  $@ --with python2
 
-install/callcontrol::
+override_dh_clean:
+	dh_clean
+	rm -rf build dist MANIFEST
+
+override_dh_install:
+	dh_install
 	install -m 0644 config.ini.sample debian/callcontrol/etc/callcontrol/config.ini
+
+.PHONY: override_dh_clean override_dh_install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)