diff --git a/debian/changelog b/debian/changelog
index 87fe4b9..1e591ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+python-passfd (0.2-4) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Upgrade to newer source format 3.0 (quilt).
+  * Add missing build dependency on dh addon.
+  * Bump debhelper from deprecated 9 to 12.
+    + Replace python_distutils buildsystem with pybuild.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Update Vcs-* headers to use salsa repository.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 22 May 2021 00:04:12 -0000
+
 python-passfd (0.2-3) unstable; urgency=medium
 
   * Update Standards-Version (no changes).
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 331fab8..7d60d36 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: python-passfd
 Maintainer: Martín Ferrari <tincho@debian.org>
 Section: python
 Priority: optional
-Build-Depends: python-all-dev, debhelper (>= 9), dh-python
+Build-Depends: python-all-dev, debhelper-compat (= 12), dh-python, python2:any | python2-dev:any | dh-sequence-python2
 Standards-Version: 3.9.8
 Homepage: https://github.com/TheTincho/python-passfd/
-Vcs-Browser: https://anonscm.debian.org/cgit/users/tincho/python-passfd.git
-Vcs-Git: https://anonscm.debian.org/git/users/tincho/python-passfd.git
+Vcs-Browser: https://salsa.debian.org/tincho/python-passfd
+Vcs-Git: https://salsa.debian.org/tincho/python-passfd.git
 
 Package: python-passfd
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 7d67da0..ef8169b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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: python-passfd
 Upstream-Contact: Martín Ferrari <martin.ferrari@gmail.com>
 Source: https://github.com/TheTincho/python-passfd/
diff --git a/debian/rules b/debian/rules
index bcebae9..ecd2737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
-
-
+	dh $@ --with python2 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..931631c
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/TheTincho/python-passfd/issues
+Bug-Submit: https://github.com/TheTincho/python-passfd/issues/new
+Repository: https://github.com/TheTincho/python-passfd.git
+Repository-Browse: https://github.com/TheTincho/python-passfd