diff --git a/CREDITS b/CREDITS
index f7f086a3cfa0a180b51229d7d1dc2205e76c4866..cd46d7955099b8cc4f8f497b44033d307a563e4a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -31,6 +31,7 @@ Mike Melanson
 Loren Merritt
 Jeff Muizelaar
 Michael Niedermayer
+Guillaume Poirier
 FranÃ§ois Revol
 Peter Ross
 MÃ¥ns RullgÃ¥rd
diff --git a/MAINTAINERS b/MAINTAINERS
index 2549ff5a93e9d8e35c729888bd5b8aacdadaf2a2..228a3e2596cac6993788f54ec8b19920b5ec4450 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -253,7 +253,7 @@ Operating systems / CPU architectures
 Alpha                                   Mans Rullgard, Falk Hueffner
 BeOS                                    Francois Revol
 i386                                    Michael Niedermayer
-Mac OS X / PowerPC                      Romain Dolbeau
+Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
 Linux / PowerPC                         Luca Barbato
 Windows MinGW                           Alex Beregszaszi