diff --git a/debian/changelog b/debian/changelog
index 0fdffe970d3417ab29306cd529e4dad0587147a8..f304a58fc5ed0b745ced167ffeacde8b824c7177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kodi-pvr-mediaportal-tvserver (3.5.18-2) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Bump debhelper from old 9 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 25 Mar 2020 03:28:06 +0000
+
 kodi-pvr-mediaportal-tvserver (3.5.18-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -74,4 +83,3 @@ kodi-pvr-mediaportal-tvserver (1.9.27-1~trusty) trusty; urgency=low
   * autogenerated dummy changelog
 
  -- Nobody <nobody@kodi.tv>  Sat, 01 Jun 2013 00:59:22 +0200
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec635144f60048986bc560c5576355344005e6e7..0000000000000000000000000000000000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index d851990d954390da85ef7398ccd45e1f298346bd..b84461f68a818e297ed4c94019848a6194a4e15e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: Balint Reczey <balint@balintreczey.hu>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 9.0.0),
+Build-Depends: debhelper-compat (= 12),
                cmake,
                kodi-addons-dev (>= 2:18~),
                libkodiplatform-dev (>= 20150826),
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000000000000000000000000000000000000..82d3c3aae4856e0a1f3c9b4c8412f66a866c5702
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+Bug-Database: https://github.com/kodi-pvr/pvr.mediaportal.tvserver/issues
+Bug-Submit: https://github.com/kodi-pvr/pvr.mediaportal.tvserver/issues/new