diff --git a/debian/control b/debian/control
index 84e44b9..a3b945e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends-Indep:
  python-paste,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
+ python-statsd,
  python-voluptuous (<< 0.7),
  python-webob,
  python-yaml
@@ -25,7 +26,8 @@ Vcs-Browser: https://github.com/pabelanger/zuul-deb
 
 Package: zuul
 Architecture: all
-Depends: libjs-jquery,
+Depends: adduser,
+ libjs-jquery,
  libjs-underscore,
  python-daemon,
  python-extras,
diff --git a/debian/copyright b/debian/copyright
index b72ec5b..aa25f45 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,12 +8,14 @@ Copyright: 2011-2013, OpenStack, LLC.
            2012, Hewlett-Packard Development Company, L.P.
            2013, Antoine "hashar" Musso
            2013, OpenStack Foundation
-           2013, Timo Tijhof
-           2013, Wikimedia Foundation
+           2013, Timo "Krinkle" Tijhof
+           2013, Wikimedia Foundation Inc.
 License: Apache
 
 Files: debian/*
-Copyright: 2012 Paul Belanger <paul.belanger@polybeacon.com>
+Copyright: 2012-2013 Paul Belanger <paul.belanger@polybeacon.com>
+           2013 Antoine Musso <hashar@free.fr>
+           2013 Wikimedia Foundation Inc.
 License: Apache
 
 License: Apache
diff --git a/debian/patches/0003-doc-rename-manpage-from-zuul-to-zuul-server.patch b/debian/patches/0003-doc-rename-manpage-from-zuul-to-zuul-server.patch
new file mode 100644
index 0000000..52adb93
--- /dev/null
+++ b/debian/patches/0003-doc-rename-manpage-from-zuul-to-zuul-server.patch
@@ -0,0 +1,39 @@
+From d5dcfd7d202ff384232bef0b097367f36728102d Mon Sep 17 00:00:00 2001
+From: Antoine Musso <hashar@free.fr>
+Date: Wed, 15 May 2013 22:13:17 +0200
+Subject: [PATCH] doc: rename manpage from `zuul` to `zuul-server`
+
+On Debian, all binaries should have an associated manpage. While
+building Zuul package we got the following lintian error:
+
+  W: zuul: binary-without-manpage usr/bin/zuul-server
+
+This is easily fixed by making sphinx to name the man page zuul-server.
+
+Change-Id: Ie9fa681654a8e7e8785c1dcfa5ec21ba27ae3049
+Reviewed-on: https://review.openstack.org/29287
+Reviewed-by: James E. Blair <corvus@inaugust.com>
+Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
+Approved: Clark Boylan <clark.boylan@gmail.com>
+Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
+Tested-by: Jenkins
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 2e05cc2..6943bd4 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -216,7 +216,7 @@ latex_documents = [
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+ man_pages = [
+-    ('index', 'zuul', u'Zuul Documentation',
++    ('index', 'zuul-server', u'Zuul Documentation',
+      [u'OpenStack'], 1)
+ ]
+ 
+-- 
+1.8.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index aba7b15..113abcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-import-error-for-zuul-version-with-docs.patch
 0002-Add-the-ability-to-set-git-user.email-and-user.name.patch
+0003-doc-rename-manpage-from-zuul-to-zuul-server.patch
diff --git a/debian/watch b/debian/watch
index 2490a71..247b90d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://tarballs.openstack.org/zuul/zuul-([0-9.]*).tar.gz debian
+http://tarballs.openstack.org/zuul/zuul-([\d\.]+)\.tar\.gz debian