diff --git a/debian/changelog b/debian/changelog
index ee5cefd..33a79b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ros-dynamic-reconfigure (1.7.0-3) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 21 Jun 2020 20:53:52 -0000
+
 ros-dynamic-reconfigure (1.7.0-2) unstable; urgency=medium
 
   * Use local IP for tests
diff --git a/debian/control b/debian/control
index 13ea6e5..7ff70ed 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Multi-Arch: same
 Description: Robot OS dynamic-reconfigure library
  This package is part of Robot OS (ROS), and contains the
  dynamic_reconfigure package which provides a means to change node
- parameters at any time without having to restart the node. 
+ parameters at any time without having to restart the node.
  .
  This package contains the library itself.
 
@@ -47,7 +47,7 @@ Recommends: python3-dynamic-reconfigure
 Description: Robot OS dynamic-reconfigure library - development files
  This package is part of Robot OS (ROS), and contains the
  dynamic_reconfigure package which provides a means to change node
- parameters at any time without having to restart the node. 
+ parameters at any time without having to restart the node.
  .
  This package contains the development files.
 
@@ -60,7 +60,7 @@ Replaces: python-dynamic-reconfigure (<< 1.6.0-2)
 Description: Robot OS dynamic-reconfigure library - Python 3 bindings
  This package is part of Robot OS (ROS), and contains the
  dynamic_reconfigure package which provides a means to change node
- parameters at any time without having to restart the node. 
+ parameters at any time without having to restart the node.
  .
  This package contains the Python 3 bindings.
 
@@ -72,7 +72,6 @@ Depends: ${misc:Depends}
 Description: Robot OS dynamic-reconfigure library - LISP bindings
  This package is part of Robot OS (ROS), and contains the
  dynamic_reconfigure package which provides a means to change node
- parameters at any time without having to restart the node. 
+ parameters at any time without having to restart the node.
  .
  This package contains the LISP bindings.
-
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..969994d
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/ros/dynamic_reconfigure/issues
+Bug-Submit: https://github.com/ros/dynamic_reconfigure/issues/new
+Repository: https://github.com/ros/dynamic_reconfigure.git
+Repository-Browse: https://github.com/ros/dynamic_reconfigure