diff -Nru rabbitvcs-0.18/debian/changelog rabbitvcs-0.18/debian/changelog
--- rabbitvcs-0.18/debian/changelog	2020-03-31 15:44:52.000000000 +0000
+++ rabbitvcs-0.18/debian/changelog	2021-09-16 03:25:43.000000000 +0000
@@ -1,3 +1,17 @@
+rabbitvcs (0.18-3) unstable; urgency=low
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+  [ Ondřej Nový ]
+  * d/control: Update Maintainer field with new Debian Python Team
+    contact address.
+  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+    layout.
+
+ -- Sandro Tosi <morph@debian.org>  Wed, 15 Sep 2021 23:25:43 -0400
+
 rabbitvcs (0.18-2) unstable; urgency=medium
 
   * Demote thunarx-python to Recommends (Closes: #955346)
diff -Nru rabbitvcs-0.18/debian/control rabbitvcs-0.18/debian/control
--- rabbitvcs-0.18/debian/control	2020-03-31 15:42:51.000000000 +0000
+++ rabbitvcs-0.18/debian/control	2021-09-16 03:25:43.000000000 +0000
@@ -1,5 +1,5 @@
 Source: rabbitvcs
-Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
+Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders: Ritesh Raj Sarraf <rrs@debian.org>
 Section: vcs
 Priority: optional
@@ -11,8 +11,8 @@
 Build-Depends-Indep: pkg-config (>= 0.20)
 Standards-Version: 4.5.0
 Homepage: http://www.rabbitvcs.org
-Vcs-Git: https://salsa.debian.org/python-team/applications/rabbitvcs.git
-Vcs-Browser: https://salsa.debian.org/python-team/applications/rabbitvcs
+Vcs-Git: https://salsa.debian.org/python-team/packages/rabbitvcs.git
+Vcs-Browser: https://salsa.debian.org/python-team/packages/rabbitvcs
 
 Package: rabbitvcs-core
 Architecture: all
diff -Nru rabbitvcs-0.18/debian/upstream/metadata rabbitvcs-0.18/debian/upstream/metadata
--- rabbitvcs-0.18/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ rabbitvcs-0.18/debian/upstream/metadata	2021-09-16 03:25:43.000000000 +0000
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/rabbitvcs/rabbitvcs/issues
+Bug-Submit: https://github.com/rabbitvcs/rabbitvcs/issues/new
+Repository: https://github.com/rabbitvcs/rabbitvcs.git
+Repository-Browse: https://github.com/rabbitvcs/rabbitvcs