diff --git a/COPYING b/COPYING
index 1bebeca..49f4fa6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 XWiimote License:
 
-Copyright (c) 2011-2013 David Herrmann <dh.herrmann@googlemail.com>
+Copyright (c) 2011-2013 David Herrmann <dh.herrmann@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files
diff --git a/README b/README
index d42a25c..599d4a2 100644
--- a/README
+++ b/README
@@ -13,7 +13,14 @@ Please also copy the configuration file, otherwise the driver won't get loaded:
 
 Please see the man-page of the driver for further information.
 
-This driver was written by David Herrmann <dh.herrmann@googlemail.com>. For
-license information see ./COPYING. If you have questions please don't hesitate
-to contact me either per email or at:
-	http://github.com/dvdhrm/xf86-input-xwiimote
+This driver was written by (ordered by commit-dates):
+	David Herrmann <dh.herrmann@gmail.com>
+	Matthew Monaco
+	Andreas Fuchs <anduchs@gmail.com>
+	John Koelndorfer <jkoelndorfer@gmail.com>
+	Nicolas Adenis-Lamarre <nicolas.adenis.lamarre@gmail.com>
+
+For license information see ./COPYING. If you have questions please don't
+hesitate to contact one of the maintainers either per email or on github:
+	- David Herrmann <dh.herrmann@gmail.com>
+	- http://github.com/dvdhrm/xf86-input-xwiimote
diff --git a/src/xwiimote.c b/src/xwiimote.c
index 000db60..d975b46 100644
--- a/src/xwiimote.c
+++ b/src/xwiimote.c
@@ -1,7 +1,7 @@
 /*
  * XWiimote
  *
- * Copyright (c) 2011, 2012 David Herrmann <dh.herrmann@googlemail.com>
+ * Copyright (c) 2011-2013 David Herrmann <dh.herrmann@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files