diff --git a/MAINTAINERS b/MAINTAINERS
index a2293b7c88d4513f9ddccee4f21f70f3473437bd..e44280ceb6d2502d2077537ba825d01235fd5588 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -437,8 +437,8 @@ T:	git git://git.denx.de/u-boot-mmc.git
 F:	drivers/mmc/
 
 NAND FLASH
-M:	Scott Wood <oss@buserror.net>
-S:	Maintained
+#M:	Scott Wood <oss@buserror.net>
+S:	Orphaned (Since 2018-07)
 T:	git git://git.denx.de/u-boot-nand-flash.git
 F:	drivers/mtd/nand/
 
diff --git a/doc/git-mailrc b/doc/git-mailrc
index af8e3358a98337abf54b5e3606824cf075845b5a..75aa675c08bd8d22951ddf4c6580864c34cda18f 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -39,7 +39,6 @@ alias prafulla       Prafulla Wadaskar <prafulla@marvell.com>
 alias prom           Minkyu Kang <mk7.kang@samsung.com>
 alias ptomsich       Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
 alias sbabic         Stefano Babic <sbabic@denx.de>
-alias scottwood      Scott Wood <oss@buserror.net>
 alias sjg            Simon Glass <sjg@chromium.org>
 alias smcnutt        Scott McNutt <smcnutt@psyent.com>
 alias stroese        Stefan Roese <sr@denx.de>
@@ -113,7 +112,7 @@ alias fdt            uboot, sjg
 alias i2c            uboot, hs
 alias kconfig        uboot, masahiro
 alias mmc            uboot, jaehoon
-alias nand           uboot, scottwood
+alias nand           uboot
 alias net            uboot, jhersh
 alias phy            uboot, jhersh
 alias spi            uboot, jagan