diff --git a/debian/control b/debian/control
index 09409e3ba88f96b180571d395c2eae7ca6590c72..cb83cb2d99ed1b18882ce78c9b5ed5a7c10ddf54 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,14 @@ Source: python-xstatic-angular-bootstrap
 Section: python
 Priority: optional
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Thomas Goirand <zigo@debian.org>
-Build-Depends: debhelper (>= 9), dh-python, python-setuptools, python-all (>= 2.6.6-3~), python3-setuptools, python3-all
+Uploaders: Thomas Goirand <zigo@debian.org>,
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all (>= 2.6.6-3~),
+               python-setuptools,
+               python3-all,
+               python3-setuptools,
+Build-Conflicts: python-xstatic, python3-xstatic
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-xstatic-angular-bootstrap.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-xstatic-angular-bootstrap.git
@@ -11,9 +17,10 @@ Homepage: https://pypi.python.org/pypi/XStatic-Angular-Bootstrap
 
 Package: python-xstatic-angular-bootstrap
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-xstatic-angular-bootstrap-doc
+Depends: python-xstatic,
+         ${misc:Depends},
+         ${python:Depends},
+Suggests: python-xstatic-angular-bootstrap-doc,
 Description: Angular-Bootstrap XStatic support - Python 2.x
  XStatic is a Python web development tool for handling required static data
  files from external projects, such as CSS, images, and JavaScript. It provides
@@ -25,9 +32,10 @@ Description: Angular-Bootstrap XStatic support - Python 2.x
 
 Package: python3-xstatic-angular-bootstrap
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python-xstatic-angular-bootstrap-doc
+Depends: python3-xstatic,
+         ${misc:Depends},
+         ${python3:Depends},
+Suggests: python-xstatic-angular-bootstrap-doc,
 Description: Angular-Bootstrap XStatic support - Python 3.x
  XStatic is a Python web development tool for handling required static data
  files from external projects, such as CSS, images, and JavaScript. It provides