diff --git a/debian/changelog b/debian/changelog
index 433caae..a93bff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+geos (3.8.1-2) UNRELEASED; urgency=low
+
+  * Remove obsolete field Contact from debian/upstream/metadata (already present
+    in machine-readable debian/copyright).
+  * Rely on pre-initialized dpkg-architecture variables.
+  * Update renamed lintian tag names in lintian overrides.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 13 Jun 2020 16:17:43 -0000
+
 geos (3.8.1-1) unstable; urgency=medium
 
   * Bump debhelper compat to 10, changes:
diff --git a/debian/rules b/debian/rules
index d90b470..7a55e79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,9 @@ export VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 # testrunner fails on some architectures
-DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 include /usr/share/dpkg/pkg-info.mk
 
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index d9d9775..18b354b 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,3 @@
 # Not worth the effort
-testsuite-autopkgtest-missing
+missing-tests-control
 
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 6393603..c9b5db8 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,6 @@
 ---
 Bug-Database: https://trac.osgeo.org/geos/report
 #Bug-Submit: https://trac.osgeo.org/geos/newticket
-Contact: GEOS Developers <geos-devel@lists.osgeo.org>
 Registration: https://www.osgeo.org/cgi-bin/ldap_create_user.py
 Repository: https://git.osgeo.org/gitea/geos/geos.git
 Repository-Browse: https://git.osgeo.org/gitea/geos/geos