diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf68ec0..522537b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ enable_testing()
 
 ######## Package information
 set (PACKAGE_URL https://www.freedesktop.org/wiki/Software/uchardet/)
-set (PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet)
+set (PACKAGE_BUGREPORT https://gitlab.freedesktop.org/uchardet/uchardet/-/issues)
 set (UCHARDET_VERSION_MAJOR 0)
 set (UCHARDET_VERSION_MINOR 0)
 set (UCHARDET_VERSION_REVISION 6)
diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
index f2aabfd..b68cb46 100644
--- a/src/tools/uchardet.cpp
+++ b/src/tools/uchardet.cpp
@@ -81,7 +81,7 @@ void show_version()
     printf("Version %s\n", VERSION);
     printf("\n");
     printf("Authors: %s\n", "BYVoid, Jehan");
-    printf("Bug Report: %s\n", "https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet");
+    printf("Bug Report: %s\n", "https://gitlab.freedesktop.org/uchardet/uchardet/-/issues");
     printf("\n");
 }
 
diff --git a/uchardet.doap b/uchardet.doap
index 84a5e79..e8a2ffd 100644
--- a/uchardet.doap
+++ b/uchardet.doap
@@ -33,7 +33,7 @@
 
   <download-page rdf:resource="https://www.freedesktop.org/software/uchardet/releases/" />
 
-  <bug-database rdf:resource="https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet" />
+  <bug-database rdf:resource="https://gitlab.freedesktop.org/uchardet/uchardet/-/issues" />
 
   <programming-language>C</programming-language>
   <programming-language>C++</programming-language>