diff --git a/debian/changelog b/debian/changelog
index c5600c0..9fcd679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+latex-coffee-stains (6-3) UNRELEASED; urgency=medium
+
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 21 Apr 2020 13:51:36 +0100
+
 latex-coffee-stains (6-2) unstable; urgency=medium
 
   * debhelper 12
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..1e42f17
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/Echsecutor/coffee/issues
+Bug-Submit: https://github.com/Echsecutor/coffee/issues/new
+Repository: https://github.com/Echsecutor/coffee.git
+Repository-Browse: https://github.com/Echsecutor/coffee