diff --git a/debian/changelog b/debian/changelog
index 8d5f23e..90bb08b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ shim (15+1533136590.3beb971-10) UNRELEASED; urgency=medium
     lines.
   * Bump debhelper from old 11 to 12.
   * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
 
  -- Debian Janitor <janitor@jelmer.uk>  Wed, 01 Apr 2020 06:38:02 +0000
 
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..0f318e7
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+Bug-Database: https://github.com/rhboot/shim/issues
+Bug-Submit: https://github.com/rhboot/shim/issues/new