diff --git a/CREDITS b/CREDITS
index 4d6beeaaca3c..3c392f7ebc6e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1542,6 +1542,10 @@ N: Andrew Haylett
 E: ajh@primag.co.uk
 D: Selection mechanism
 
+N: Johan Hedberg
+E: johan.hedberg@gmail.com
+D: Bluetooth subsystem maintainer
+
 N: Andre Hedrick
 E: andre@linux-ide.org
 E: andre@linuxdiskcert.org
diff --git a/MAINTAINERS b/MAINTAINERS
index 1ef18977427e..80422f639352 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3609,7 +3609,6 @@ F:	drivers/mtd/devices/block2mtd.c
 
 BLUETOOTH DRIVERS
 M:	Marcel Holtmann <marcel@holtmann.org>
-M:	Johan Hedberg <johan.hedberg@gmail.com>
 M:	Luiz Augusto von Dentz <luiz.dentz@gmail.com>
 L:	linux-bluetooth@vger.kernel.org
 S:	Supported