diff --git a/README.md b/README.md
index b8ae50d..73950dd 100644
--- a/README.md
+++ b/README.md
@@ -58,12 +58,10 @@ xkbcommon is maintained in git at
 
 Patches are always welcome, and may be sent to either
     <xorg-devel@lists.x.org> or <wayland-devel@lists.freedesktop.org>
-or through github.
+or in a [GitHub](https://github.com/xkbcommon/libxkbcommon) pull request.
 
-Bug reports are also welcome, and may be filed either at
-    Bugzilla https://bugs.freedesktop.org/describecomponents.cgi?product=libxkbcommon
-or
-    Github https://github.com/xkbcommon/libxkbcommon/issues
+Bug reports are also welcome, and may be filed at
+[GitHub](https://github.com/xkbcommon/libxkbcommon/issues).
 
 The maintainers are
 - Daniel Stone <daniel@fooishbar.org>
diff --git a/configure.ac b/configure.ac
index d132435..957da59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 # Initialize Autoconf
 AC_PREREQ([2.63])
 AC_INIT([libxkbcommon], [0.8.4],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon],
+        [https://github.com/xkbcommon/libxkbcommon/issues],
         [libxkbcommon], [https://xkbcommon.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h])