diff --git a/CREDITS b/CREDITS
index cef042453fa4df6414956f8a4f47ff693d55ad8a..61eabf7ca37614fe83239b4e4bbd91ada337bcfc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2711,6 +2711,9 @@ N: Greg Page
 E: gpage@sovereign.org
 D: IPX development and support
 
+N: Venkatesh Pallipadi (Venki)
+D: x86/HPET
+
 N: David Parsons
 E: orc@pell.chi.il.us
 D: improved memory detection code.
diff --git a/MAINTAINERS b/MAINTAINERS
index ad3b5a459ebc5b7422fa74741195a431e48384bf..2f2675493b3afa3732c9979cfbae15bc2547ec77 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4155,8 +4155,7 @@ F:	include/linux/hpet.h
 F:	include/uapi/linux/hpet.h
 
 HPET:	x86
-M:	"Venkatesh Pallipadi (Venki)" <venki@google.com>
-S:	Maintained
+S:	Orphan
 F:	arch/x86/kernel/hpet.c
 F:	arch/x86/include/asm/hpet.h