diff --git a/MAINTAINERS b/MAINTAINERS
index 97941cbcee..ec92dc3d66 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -31,7 +31,7 @@ ffplay:
   ffplay.c
 
 ffserver:
-  ffserver.c, ffserver.h
+  ffserver.c, ffserver.h                Alex Beregszaszi
 
 Commandline utility code:
   cmdutils.c, cmdutils.h
@@ -246,3 +246,4 @@ i386                                    Michael Niedermayer
 Mac OS X / PowerPC                      Romain Dolbeau
 Amiga / PowerPC                         Colin Ward
 Linux / PowerPC                         Luca Barbato
+Windows MinGW                           Alex Beregszaszi