diff --git a/AUTHORS b/AUTHORS
index 3116044..f8dac66 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,9 +2,11 @@ Luca Barbato <lu_zero@gentoo.org>
 Eric Edgar <rocket@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Tom Gall <tgall@gentoo.org>
+Andrew Gaffney <agaffney@gentoo.org>
 Chris Gianelloni <wolf31o2@gentoo.org>
 Brad House <brad_mssw@gentoo.org>
 Brain Jackson <iggy@gentoo.org>
+Robin H. Johnson <robbat2@gentoo.org>
 Joshua Kinard <kumba@gentoo.org>
 Seemant Kulleen <seemant@gentoo.org>
 Guy Martin <gmsoft@gentoo.org>
diff --git a/ChangeLog b/ChangeLog
index 8dbf672..aa2c766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  15 Sep 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> AUTHORS:
+  Adding Andrew and Robin to AUTHORS.
+
   15 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  Add dummy handler for --config in gen_cmdline.sh for bug 237541
+  Add dummy handler for --config in gen_cmdline.sh for Gentoo bug #237541
 
   12 Sep 2008; Chris Gianelloni <wolf31o2@wolf31o2.org>
   arch/alpha/modules_load, arch/ia64/modules_load, arch/mips/modules_load,