diff --git a/MAINTAINERS b/MAINTAINERS
index c8386ab619..f7a1723004 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -390,6 +390,7 @@ T:	git git://git.denx.de/u-boot-tq-group.git
 
 UBI
 M:	Kyungmin Park <kmpark@infradead.org>
+M:	Heiko Schocher <hs@denx.de>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-ubi.git
 F:	drivers/mtd/ubi/
diff --git a/doc/git-mailrc b/doc/git-mailrc
index ad22763960..69fe443b30 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -119,6 +119,7 @@ alias mmc            uboot, panto
 alias nand           uboot, scottwood
 alias net            uboot, jhersh
 alias spi	     uboot, jagan
+alias ubi            uboot, hs
 alias usb            uboot, marex
 alias video          uboot, ag
 alias patman         uboot, sjg