2 files changed, 6 insertions, 3 deletions

diff --git a/CREDITS b/CREDITS
index 1d39a6d0a510..d6585ab7a3ab 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3913,6 +3913,10 @@ S: Flandernstrasse 101
 S: D-73732 Esslingen
 S: Germany
 
+N: Roman Zippel
+E: zippel@linux-m68k.org
+D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5
+
 N: Leonard N. Zubkoff
 W: http://www.dandelion.com/Linux/
 D: BusLogic SCSI driver
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b4b9cdec370..0398ba5fcba5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3577,10 +3577,9 @@ F:	Documentation/hwmon/k8temp
 F:      drivers/hwmon/k8temp.c
 
 KCONFIG
-M:      Roman Zippel <zippel@linux-m68k.org>
+M:      Michal Marek <mmarek@suse.cz>
 L:      linux-kbuild@vger.kernel.org
-Q:      http://patchwork.kernel.org/project/linux-kbuild/list/
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/kbuild/kconfig-language.txt
 F:      scripts/kconfig/