diff --git a/AUTHORS b/AUTHORS
index 76eb6e4c6..99bb0e26e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,7 @@ Program: GnuPG
 Homepage: https://www.gnupg.org
 Download: https://gnupg.org/ftp/gcrypt/gnupg/
 Repository: git://git.gnupg.org/gnupg.git
-Bug reports: https://dev.gnupg.org
+Bug reports: https://bugs.gnupg.org
 Security related bug reports: <security@gnupg.org>
 Maintainer: Werner Koch <wk@gnupg.org>
 License: GPLv3+
diff --git a/README b/README
index e0c5d7174..aaf347c68 100644
--- a/README
+++ b/README
@@ -227,7 +227,7 @@
   https://www.gnupg.org/documentation/mailing-lists.html for archives
   of the mailing lists.
 
-  Please direct bug reports to http://dev.gnupg.org or post them
+  Please direct bug reports to [[http://bugs.gnupg.org]] or post them
   direct to the mailing list <gnupg-devel@gnupg.org>.
 
   Please direct questions about GnuPG to the users mailing list or one
diff --git a/configure.ac b/configure.ac
index 56cb78e52..02ee1a225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ m4_define([mym4_version],      m4_argn(4, mym4_verslist))
 m4_define([mym4_revision],     m4_argn(7, mym4_verslist))
 m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
 m4_esyscmd([echo ]mym4_version[>VERSION])
-AC_INIT([mym4_package],[mym4_version], [https://dev.gnupg.org])
+AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
 
 NEED_GPG_ERROR_VERSION=1.24
 
diff --git a/doc/announce-2.1.txt b/doc/announce-2.1.txt
index 137f0b19a..eccd0e762 100644
--- a/doc/announce-2.1.txt
+++ b/doc/announce-2.1.txt
@@ -236,7 +236,7 @@ Support
 Please consult the archive of the gnupg-users mailing list before
 reporting a bug <https://gnupg.org/documentation/mailing-lists.html>.
 We suggest to send bug reports for a new release to this list in favor
-of filing a bug at <https://dev.gnupg.org>.  For commercial support
+of filing a bug at <https://bugs.gnupg.org>.  For commercial support
 requests we keep a list of known service companies at:
 
   https://gnupg.org/service.html
diff --git a/doc/faq.org b/doc/faq.org
index 5619faa6d..ddbeafaf8 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -1139,7 +1139,7 @@ update this FAQ in the next month.  See the section "Changes" for recent updates
     the list of reported bugs on the documentation page). If you're
     not sure about it being a bug, you can send mail to the
     gnupg-devel list. Otherwise, use the bug tracking system at
-    [[https://dev.gnupg.org][dev.gnupg.org]].
+    [[https://bugs.gnupg.org][bugs.gnupg.org]].
 
 ** Why doesn't GnuPG support X.509 certificates?
    :PROPERTIES:
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 1b5dee0b5..9147bdf4b 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3806,7 +3806,7 @@ may be recoverable from it later.
 
 Before you report a bug you should first search the mailing list
 archives for similar problems and second check whether such a bug has
-already been reported to our bug tracker at https://dev.gnupg.org .
+already been reported to our bug tracker at @url{https://bugs.gnupg.org}.
 
 @c *******************************************
 @c ***************              **************