diff --git a/AUTHORS b/AUTHORS
index f5d97bc51..bf4f84de6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1 @@
-Current authors:
-Dan Williams <dcbw@redhat.com>
-Tambet Ingo <tambet@gmail.com>
-
-Previous authors:
-Robert Love <rml@novell.com>
+The NetworkManager Team <networkmanager-list@gnome.org>
diff --git a/MAINTAINERS b/MAINTAINERS
index 7f54d2cf1..43707bb61 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-Dan Williams
-E-mail: dcbw redhat com
-Userid: dcbw
+Lubomir Rintel
+E-mail: lkundrak v3 sk
+Userid: lkundrak