diff --git a/CREDITS b/CREDITS
index 2520ba620ff12a482e385b0c34403fe044ba0027..2b88fb37ad503e12ed271aa26b1068b7c5d93aea 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
 S: Sterling Heights, Michigan 48313
 S: USA
 
+N: Wolfgang Grandegger
+E: wg@grandegger.com
+D: Controller Area Network (device drivers)
+
 N: William Greathouse
 E: wgreathouse@smva.com
 E: wgreathouse@myfavoritei.com
diff --git a/MAINTAINERS b/MAINTAINERS
index 3dfe1a7c9a93a8ba162cb37996efcdf5825edff0..b5160a21c4907c0bcb8016c97d820f1e727f3af1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1278,6 +1278,13 @@ F:	drivers/net/can/
 F:	include/linux/can/
 F:	include/linux/can.h
 
+CAN NETWORK DRIVERS
+P:	Wolfgang Grandegger
+M:	wg@grandegger.com
+L:	socketcan-core@lists.berlios.de (subscribers-only)
+W:	http://developer.berlios.de/projects/socketcan/
+S:	Maintained
+
 CELL BROADBAND ENGINE ARCHITECTURE
 P:	Arnd Bergmann
 M:	arnd@arndb.de