diff --git a/CREDITS b/CREDITS
index 17962bdd6dbd..42a79083b98e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2804,6 +2804,7 @@ D: Some of PAS 16 mixer & PCM support, inet6-apps
 
 N: William (Bill) Metzenthen
 E: billm@suburbia.net
+E: billm@melbpc.org.au
 D: Author of the FPU emulator.
 D: Minor kernel hacker for other lost causes (Hercules mono, etc).
 S: 22 Parker Street
diff --git a/MAINTAINERS b/MAINTAINERS
index c152274a8dc9..dcdc7bda7ace 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10101,12 +10101,6 @@ F:	Documentation/fpga/
 F:	drivers/fpga/
 F:	include/linux/fpga/
 
-FPU EMULATOR
-M:	Bill Metzenthen <billm@melbpc.org.au>
-S:	Maintained
-W:	https://floatingpoint.billm.au/
-F:	arch/x86/math-emu/
-
 FRAMEBUFFER CONSOLE
 M:	Helge Deller <deller@gmx.de>
 M:	Thomas Zimmermann <tzimmermann@suse.de>