diff --git a/debian/changelog b/debian/changelog
index 7cc4f1a..909b06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@
   [ Debian Janitor ]
   * Use secure copyright file specification URI.
   * Bump debhelper from old 10 to 12.
+  * Trim trailing whitespace.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Fri, 14 Sep 2018 14:15:19 +0100
 
diff --git a/debian/rules b/debian/rules
index e1aab3f..a8481ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_install:
 	$(MAKE) install BINDIR=$(CURDIR)/debian/openbox-menu/usr/bin
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..5c7bfed
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/woho/openbox-menu/issues
+Bug-Submit: https://github.com/woho/openbox-menu/issues/new
+Repository: https://github.com/woho/openbox-menu.git
+Repository-Browse: https://github.com/woho/openbox-menu