diff --git a/debian/changelog b/debian/changelog
index 8a18b3d..b45b776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+doxypypy (0.8.8.6-5) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+ * Add debian/watch file, using pypi.
+ * Update standards version to 4.6.0, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 24 Apr 2022 04:53:23 -0000
+
doxypypy (0.8.8.6-4) unstable; urgency=medium
* added a dependency on python3-chardet
diff --git a/debian/control b/debian/control
index 3cd9f88..fc6884a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 13),
python3-setuptools,
pandoc
X-Python3-Version: >= 3.7
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Homepage: https://github.com/Feneric/doxypypy
Vcs-Browser: https://salsa.debian.org/georgesk/doxypypy
Vcs-Git: https://salsa.debian.org/georgesk/doxypypy.git
diff --git a/debian/rules b/debian/rules
index a357d9e..c373289 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,4 +30,3 @@ override_dh_install:
dh_install
install -d $(DESTDIR)/usr/share/python3-doxypypy
pandoc README.rst --standalone --to html -o $(DESTDIR)/usr/share/python3-doxypypy/README.html
-
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..f9d322f
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/Feneric/doxypypy/issues
+Bug-Submit: https://github.com/Feneric/doxypypy/issues/new
+Repository: https://github.com/Feneric/doxypypy.git
+Repository-Browse: https://github.com/Feneric/doxypypy
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a4ddf24
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+https://pypi.debian.net/doxypypy/doxypypy-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
