diff --git a/debian/changelog b/debian/changelog
index 49bff3c..d6b4f12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kbd (2.2.0-2) UNRELEASED; urgency=low
+
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 31 Aug 2020 01:31:01 -0000
+
 kbd (2.2.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..5c30f13
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/legionus/kbd/issues
+Bug-Submit: https://github.com/legionus/kbd/issues/new