diff --git a/debian/changelog b/debian/changelog
index 6b12929..a3db79c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+votca-csg (1.6.1-2) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Set debhelper-compat version in Build-Depends.
+  * Set field Upstream-Contact in debian/copyright.
+  * Remove obsolete fields Contact, Name from debian/upstream/metadata (already
+    present in machine-readable debian/copyright).
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 28 Jul 2020 02:55:19 -0000
+
 votca-csg (1.6.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -123,7 +134,7 @@ votca-csg (1.3.0-1) unstable; urgency=medium
   * debian/rules (override_dh_auto_install):Updated.
 
   [ Michael Banck ]
-  * debian/patches/gromacs-5.1.patch: Removed, no longer needed. 
+  * debian/patches/gromacs-5.1.patch: Removed, no longer needed.
   * debian/control (Build-Depends): Added libsqlite3-dev,
     libboost-filesystem-dev and libboost-system-dev.
   * debian/control (libvotca-csg2-dev): Renamed to ...
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 2fd082c..ec1a087 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Christoph Junghans <junghans@votca.org>,
            Nicholas Breen <nbreen@debian.org>
 Build-Depends: bash-completion,
                cmake,
-               debhelper (>= 12),
+               debhelper-compat (= 12),
                dh-python,
                libboost-filesystem-dev,
                libboost-program-options-dev,
diff --git a/debian/copyright b/debian/copyright
index 316eb61..744cf82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: votca-csg
 Source: https://github.com/votca/csg/releases
+Upstream-Contact: devs@votca.org
 
 Files: *
 Copyright: 2009-2020 The VOTCA Development Team
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 88da272..c73af31 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,6 +1,4 @@
-Name: votca-csg
 Homepage: http://www.votca.org
-Contact: devs@votca.org
 Bug-Database: https://github.com/votca/csg/issues
 Bug-Submit: https://github.com/votca/csg/issues/new
 Cite-As: VOTCA