diff --git a/MAINTAINERS b/MAINTAINERS
index 9c30d4663..a3314f054 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22,8 +22,12 @@ Lua
 Maintainer: Thierry Fournier <tfournier@arpalert.org>
 Files: src/hlua.c, include/*/hlua.h
 
+Maps and pattern matching
+Maintainer: Thierry Fournier <tfournier@arpalert.org>
+Files: src/maps.c, src/pattern.c, include/*/maps.h, include/*/pattern.h
+
 DNS
-Maintainer: Baptiste Assmann <bassmann@haproxy.com>
+Maintainer: Baptiste Assmann <bedis9@gmail.com>
 Files: src/dns.c, include/*/dns.h
 
 SSL
@@ -34,3 +38,8 @@ PEERS
 Maintainer: Emeric Brun <ebrun@haproxy.com>
 Files: src/peers.c, include/*/peers.h
 
+DOC to HTML converter (dconv)
+Maintainer: Cyril Bonté <cyril.bonte@free.fr>
+Files: doc/*.txt
+Note: ask Cyril before changing any doc's format or structure.
+