diff --git a/MAINTAINERS b/MAINTAINERS
index 5663713db0766aa4e61e3f77f520990eda07c65e..c49cfd011d2fc696bb09b4f30085c655d2718271 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8804,12 +8804,6 @@ M:	Arnaud Patard <arnaud.patard@rtp-net.org>
 S:	Odd Fixes
 F:	drivers/staging/xgifb/
 
-STAGING - XILLYBUS DRIVER
-M:	Eli Billauer <eli.billauer@gmail.com>
-L:	devel@driverdev.osuosl.org
-S:	Supported
-F:	drivers/staging/xillybus/
-
 STARFIRE/DURALAN NETWORK DRIVER
 M:	Ion Badulescu <ionut@badula.org>
 S:	Odd Fixes
@@ -10218,6 +10212,12 @@ L:	linux-serial@vger.kernel.org
 S:	Maintained
 F:	drivers/tty/serial/uartlite.c
 
+XILLYBUS DRIVER
+M:	Eli Billauer <eli.billauer@gmail.com>
+L:	linux-kernel@vger.kernel.org
+S:	Supported
+F:	drivers/char/xillybus/
+
 XTENSA XTFPGA PLATFORM SUPPORT
 M:	Max Filippov <jcmvbkbc@gmail.com>
 L:	linux-xtensa@linux-xtensa.org