diff --git a/debian/changelog b/debian/changelog
index 5fb126ab8d..0996176f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openssl (1.1.1i-4) UNRELEASED; urgency=medium
+
+  * Update watch file format version to 4.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Fix day-of-week for changelog entries 0.9.8a-7, 0.9.8a-6, 0.9.8a-4.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 06 Feb 2021 21:11:35 -0000
+
 openssl (1.1.1i-3) unstable; urgency=medium
 
   * Cherry-pick a patch from upstream to address #13931.
@@ -1646,7 +1655,7 @@ openssl (0.9.8a-7) unstable; urgency=high
   * Call conn_state() if the BIO is not in the BIO_CONN_S_OK state
     (Closes: #352047).  RC bug affecting testing, so urgency high.
 
- -- Kurt Roeckx <kurt@roeckx.be>  Sat,  9 Feb 2006 19:07:56 +0100
+ -- Kurt Roeckx <kurt@roeckx.be>  Thu, 09 Feb 2006 19:07:56 +0100
 
 openssl (0.9.8a-6) unstable; urgency=low
 
@@ -1662,7 +1671,7 @@ openssl (0.9.8a-6) unstable; urgency=low
     in an "decryption failed or bad record mac" error in case
     both sides were using zlib compression.  (Closes: #338006)
 
- -- Kurt Roeckx <kurt@roeckx.be>  Mon, 21 Jan 2006 16:25:41 +0100
+ -- Kurt Roeckx <kurt@roeckx.be>  Sat, 21 Jan 2006 16:25:41 +0100
 
 openssl (0.9.8a-5) unstable; urgency=low
 
@@ -1692,7 +1701,7 @@ openssl (0.9.8a-4) unstable; urgency=low
     not fail the build process if an error is found.
   * Add build dependency on bc for the regression tests.
 
- -- Kurt Roeckx <kurt@roeckx.be>  Wed, 13 Nov 2005 16:01:05 +0100
+ -- Kurt Roeckx <kurt@roeckx.be>  Sun, 13 Nov 2005 16:01:05 +0100
 
 openssl (0.9.8a-3) unstable; urgency=high
 
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000000..ceeef1f2e1
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/openssl/openssl/issues
+Bug-Submit: https://github.com/openssl/openssl/issues/new
+Repository: https://github.com/openssl/openssl.git
+Repository-Browse: https://github.com/openssl/openssl
diff --git a/debian/watch b/debian/watch
index 64749e1c99..487c668ade 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 opts=pgpsigurlmangle=s/$/.asc/ https://www.openssl.org/source/ openssl-(1.1.1.*).tar.gz