diff --git a/README.md b/README.md
index a34f409..8679d35 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,8 @@ libevdev is a wrapper library for evdev devices. it moves the common
 tasks when dealing with evdev devices into a library and provides a library
 interface to the callers, thus avoiding erroneous ioctls, etc.
 
-http://github.com/whot/libevdev
+git://git.freedesktop.org/git/libevdev
+http://cgit.freedesktop.org/libevdev/
 
 **libevdev is currently in early stages of development. Use at your own risk**
 
@@ -15,3 +16,5 @@ devices, thus making direct access unnecessary.
 Go here for the API documentation:
 http://whot.github.io/libevdev/
 
+File bugs in the freedesktop.org bugzilla:
+https://bugs.freedesktop.org/enter_bug.cgi?product=libevdev
diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h
index 9071f5d..ecc382f 100644
--- a/libevdev/libevdev.h
+++ b/libevdev/libevdev.h
@@ -125,7 +125,7 @@
  * @endcode
  *
  * A more complete example is available with the libevdev-events tool here:
- * https://github.com/whot/libevdev/blob/master/tools/libevdev-events.c
+ * http://cgit.freedesktop.org/libevdev/tree/tools/libevdev-events.c
  *
  * libevdev internal test suite
  * ============================
@@ -173,7 +173,12 @@
  * License information
  * ===================
  * libevdev is licensed under the
- * [X11 license](http://github.com/whot/libevdev/blob/master/COPYING).
+ * [X11 license](http://cgit.freedesktop.org/libevdev/tree/COPYING).
+ *
+ * Reporting bugs
+ * ==============
+ * Please report bugs in the freedesktop.org bugzilla under the libevdev product:
+ * https://bugs.freedesktop.org/enter_bug.cgi?product=libevdev
  */
 
 /**