diff --git a/configure.ac b/configure.ac
index 2c4379abb20..82f12507745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 AC_PREREQ([2.69])
 AC_INIT([GNU Guix],
   [m4_esyscmd([build-aux/git-version-gen .tarball-version])],
-  [bug-guix@gnu.org], [guix],
+  [https://codeberg.org/guix/guix/issues/], [guix],
   [https://www.gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])
 
diff --git a/guix/self.scm b/guix/self.scm
index 2a997653599..eab6c32076b 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1151,7 +1151,8 @@ itself."
                           (package-version "0")
                           (channel-metadata #f)
                           (config-variables %config-variables)
-                          (bug-report-address "bug-guix@gnu.org")
+                          (bug-report-address
+                           "https://codeberg.org/guix/guix/issues/")
                           (home-page-url "https://guix.gnu.org"))
 
   ;; Hack so that Geiser is not confused.
diff --git a/guix/ui.scm b/guix/ui.scm
index 1673285e715..3514059161a 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -584,7 +584,7 @@ There is NO WARRANTY, to the extent permitted by law.
   ;; ...\n" with the address for translation bugs (typically your translation
   ;; team's web or email address).
   (format #t (G_ "
-Report bugs to: ~a.") %guix-bug-report-address)
+Report bugs to: <~a>") %guix-bug-report-address)
   (format #t (G_ "
 ~a home page: <~a>") %guix-package-name %guix-home-page-url)
   (format #t (G_ "