diff --git a/debian/changelog b/debian/changelog
index 0cec149e1553e2ad303225791b3fd251c1fdbb23..1bbbc2b8d1309d64d4f6f5426b00323cceb3da58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+iraf (2.16.1+2018.11.01-4) UNRELEASED; urgency=medium
+
+  * Use secure URI in debian/watch.
+  * Set upstream metadata fields: Bug-Submit, Repository-Browse.
+  * Remove obsolete field Name from debian/upstream/metadata.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 06 Dec 2019 18:20:55 +0000
+
 iraf (2.16.1+2018.11.01-3) unstable; urgency=low
 
   * Add gitlab CI file
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 10f6fcb1a4ac45cfd7a480f0488f496eec89d6d4..badcf53257c1878d34b6cfb9332c62a482e46e03 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,14 +1,15 @@
 ASCL-Id: 9911.002
 Bug-Database: https://github.com/iraf-community/iraf/issues
-Name: IRAF
 Reference:
- Author: Tody, Doug
- Title: "The IRAF Data Reduction and Analysis System"
- Journal: Proc.SPIE
- Year: 1986
- Volume: 627 
- Pages: 733 - 748
- URL: http://adsabs.harvard.edu/abs/1986SPIE..627..733T
- Eprint: http://iraf.noao.edu/iraf/ftp/iraf/docs/iraf.ps.Z
- Doi: 10.1117/12.968154
+  Author: Tody, Doug
+  Title: "The IRAF Data Reduction and Analysis System"
+  Journal: Proc.SPIE
+  Year: 1986
+  Volume: 627
+  Pages: 733 - 748
+  URL: http://adsabs.harvard.edu/abs/1986SPIE..627..733T
+  Eprint: http://iraf.noao.edu/iraf/ftp/iraf/docs/iraf.ps.Z
+  Doi: 10.1117/12.968154
 Repository: https://github.com/iraf-community/iraf
+Bug-Submit: https://github.com/iraf-community/iraf/issues/new
+Repository-Browse: https://github.com/iraf-community/iraf
diff --git a/debian/watch b/debian/watch
index f4ac95185251756418f50843d5a06042aacb9708..506643cdcbdb7fbb7c69192588f77b40cd253a77 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
 #opts=dversionmangle=s/\+.+//,uversionmangle=s/(.)(.+)/$1.$2/ \
-# http://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz
+# https://iraf.noao.edu/ ftp://iraf.noao.edu/iraf/v(.+)/PCIX/iraf-src.tar.gz
 opts=uversionmangle=s/-/+/,filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/iraf-$1\.tar\.gz/ \
   https://github.com/iraf-community/iraf/tags .*/v?(\d\S+)\.tar\.gz