diff --git a/MAINTAINERS b/MAINTAINERS
index 1e79376b30..77367af491 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -211,7 +211,7 @@ Codecs:
   vp3*                                  Mike Melanson
   vp5                                   Aurelien Jacobs
   vp6                                   Aurelien Jacobs
-  vp8                                   David Conrad
+  vp8                                   David Conrad, Jason Garrett-Glaser, Ronald Bultje
   vqavideo.c                            Mike Melanson
   wavpack.c                             Kostya Shishkov
   wmaprodec.c                           Sascha Sommer
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 284c976324..81447c4fd8 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2010 David Conrad
  * Copyright (C) 2010 Ronald S. Bultje
+ * Copyright (C) 2010 Jason Garrett-Glaser
  *
  * This file is part of FFmpeg.
  *