diff --git a/packaging/ubuntu/README b/packaging/ubuntu/README
index 1d95683..942c9a9 100644
--- a/packaging/ubuntu/README
+++ b/packaging/ubuntu/README
@@ -2,7 +2,7 @@ Upload new version to PPA
 =========================
 
 WORKDIR=/tmp/yamllint-ubuntu
-VERSION=1.0.3
+VERSION=1.2.0
 
 git clone -b packaging https://github.com/adrienverge/yamllint.git $WORKDIR
 cd $WORKDIR
@@ -22,5 +22,9 @@ dch -v $VERSION-0ubuntu1
 # Build packages and sign dsc
 debuild -S -sa
 
+# Test if it builds
+sudo pbuilder --create
+sudo pbuilder --build ../yamllint_$VERSION-0ubuntu1.dsc
+
 # Upload to PPA
 dput ppa:adrienverge/ppa ../yamllint_$VERSION-0ubuntu1_source.changes
diff --git a/packaging/ubuntu/debian/changelog b/packaging/ubuntu/debian/changelog
index 5c7cdd5..31300d1 100644
--- a/packaging/ubuntu/debian/changelog
+++ b/packaging/ubuntu/debian/changelog
@@ -1,3 +1,9 @@
+yamllint (1.2.0-0ubuntu1) trusty; urgency=medium
+
+  * Update to new upstream version
+
+ -- Adrien Vergé <adrienverge@gmail.com>  Mon, 07 Mar 2016 07:54:19 +0100
+
 yamllint (1.0.3-0ubuntu2) trusty; urgency=medium
 
   * Add python3-nose to build dependencies
diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control
index 004409b..e10d7f8 100644
--- a/packaging/ubuntu/debian/control
+++ b/packaging/ubuntu/debian/control
@@ -2,15 +2,25 @@ Source: yamllint
 Section: devel
 Priority: optional
 Maintainer: Adrien Vergé <adrienverge@gmail.com>
-Build-Depends: debhelper (>= 8.0.0), python3-all, python3-setuptools, python3-yaml, python3-nose
-Standards-Version: 3.9.4
+Build-Depends:
+ debhelper (>=9),
+ python3-all,
+ python3-nose,
+ python3-setuptools,
+ python3-sphinx,
+ python3-yaml,
+Standards-Version: 3.9.7
 Homepage: https://github.com/adrienverge/yamllint
-#Vcs-Git: git://git.debian.org/collab-maint/yamllint.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/yamllint.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/yamllint.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/yamllint.git
 
 Package: yamllint
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-yaml
+Depends:
+ python3-yaml,
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
 Description: A linter for YAML files
  yamllint does not only check for syntax validity, but for weirdnesses like key
  repetition and cosmetic problems such as lines length, trailing spaces,
diff --git a/packaging/ubuntu/debian/copyright b/packaging/ubuntu/debian/copyright
index 54ce2ad..1604551 100644
--- a/packaging/ubuntu/debian/copyright
+++ b/packaging/ubuntu/debian/copyright
@@ -1,9 +1,9 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: yamllint
 Source: https://github.com/adrienverge/yamllint
 
 Files: *
-Copyright: 2016 Adrien Vergé <unknown@unknown>
+Copyright: 2016 Adrien Vergé <adrienverge@gmail.com>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -17,22 +17,3 @@ License: GPL-3+
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Files: debian/*
-Copyright: 2016 Adrien Vergé <unknown@unknown>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules
index 729afc3..81b30d7 100755
--- a/packaging/ubuntu/debian/rules
+++ b/packaging/ubuntu/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman docs build/man
+
+override_dh_installman:
+	dh_installman build/man/yamllint.1
diff --git a/packaging/ubuntu/debian/upstream/metadata b/packaging/ubuntu/debian/upstream/metadata
new file mode 100644
index 0000000..0eb5e8b
--- /dev/null
+++ b/packaging/ubuntu/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/adrienverge/yamllint/issues
+FAQ: https://yamllint.readthedocs.org/
+Name: yamllint
+Repository: https://github.com/adrienverge/yamllint
diff --git a/packaging/ubuntu/debian/watch b/packaging/ubuntu/debian/watch
new file mode 100644
index 0000000..91d591f
--- /dev/null
+++ b/packaging/ubuntu/debian/watch
@@ -0,0 +1,3 @@
+# watch control file for uscan
+version=3
+https://github.com/adrienverge/yamllint/tags .*/archive/v(\d\S*)\.tar\.gz