diff -Nru kazoo-1.3.1/debian/changelog kazoo-1.3.1/debian/changelog
--- kazoo-1.3.1/debian/changelog	2014-05-02 00:51:55.000000000 +0000
+++ kazoo-1.3.1/debian/changelog	2014-05-05 17:44:21.000000000 +0000
@@ -1,17 +1,18 @@
-kazoo (1.3.1-3) precise; urgency=low
+kazoo (1.3.1-1contrail2) precise; urgency=low
 
-  * OpenContrail ppa version (precise)
-
- -- Pedro Marques <roque@juniper.net>  Thu, 1 May 2014 15:07:00 -0800
-
-kazoo (1.3.1-1) unstable; urgency=low
+  [ Sebastien Badia ]
+  * Ubuntu release (for Contrail)
+  * Remove dh-python, and python3
+  * Fix lintian errors
+  * Fix source build
 
+  [ Neil Williams ]
   * New upstream release.
   * Use pybuild.
   * Add Python 3 support (Closes: #739482).
   * Bumped standards version to 3.9.5. No changes needed.
 
- -- Neil Williams <neil@spladug.net>  Wed, 19 Feb 2014 14:17:54 -0800
+ -- Sebastien Badia <seb@sebian.fr>  Mon, 05 May 2014 17:29:58 +0000
 
 kazoo (1.2.1-1) unstable; urgency=low
 
diff -Nru kazoo-1.3.1/debian/control kazoo-1.3.1/debian/control
--- kazoo-1.3.1/debian/control	2014-05-02 00:03:50.000000000 +0000
+++ kazoo-1.3.1/debian/control	2014-05-05 17:27:49.000000000 +0000
@@ -5,8 +5,8 @@
 Build-Depends: debhelper (>= 8),
                python-all (>= 2.6.6-3),
                python-setuptools (>= 0.6b3),
+               python-repoze.sphinx.autointerface,
                python-sphinx (>= 1.0.7+dfsg),
-	       python-repoze.sphinx.autointerface,	       
                python-gevent,
 Standards-Version: 3.9.5
 Homepage: https://kazoo.readthedocs.org
diff -Nru kazoo-1.3.1/debian/python-kazoo-doc.docs kazoo-1.3.1/debian/python-kazoo-doc.docs
--- kazoo-1.3.1/debian/python-kazoo-doc.docs	2014-02-22 08:24:17.000000000 +0000
+++ kazoo-1.3.1/debian/python-kazoo-doc.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-build/html
diff -Nru kazoo-1.3.1/debian/python-kazoo.install kazoo-1.3.1/debian/python-kazoo.install
--- kazoo-1.3.1/debian/python-kazoo.install	2013-09-25 07:34:33.000000000 +0000
+++ kazoo-1.3.1/debian/python-kazoo.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/python2*
diff -Nru kazoo-1.3.1/debian/rules kazoo-1.3.1/debian/rules
--- kazoo-1.3.1/debian/rules	2014-05-02 01:43:16.000000000 +0000
+++ kazoo-1.3.1/debian/rules	2014-05-05 17:42:53.000000000 +0000
@@ -1,28 +1,20 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=kazoo
-export PYBUILD_DISABLE=test
-
 %:
-	dh $@ --with python2
-
-.PHONY: override_dh_installchangelogs
-override_dh_installchangelogs:
-	dh_installchangelogs CHANGES.rst
+	dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
 
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	sphinx-build -b html docs build/html
-	dh_auto_build -S python_distutils
-
-.PHONY: override_dh_auto_install
+PYTHONS:=$(shell pyversions -vr)
 override_dh_auto_install:
-	dh_auto_install -S python_distutils
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-kazoo ; \
+	done
 
-.PHONY: override_dh_clean
-override_dh_clean:
-	rm -rf build
-	dh_clean
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.rst
 
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
\ No newline at end of file
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	sphinx-build -b html docs/ $(CURDIR)/debian/python-kazoo-doc/usr/share/doc/python-kazoo-doc/html
+	dh_sphinxdoc -O--buildsystem=python_distutils
+endif