diff --git a/doc/chips/w83792d b/doc/chips/w83792d
index 5f4976c0..91bfefe9 100644
--- a/doc/chips/w83792d
+++ b/doc/chips/w83792d
@@ -11,7 +11,7 @@ Supported chips:
     Datasheet: Available to LM_Sensors group, sent by Chunhao Huang
 
 
-Author: Chunhao Huang @ Winbond <huang0@winbond.com.tw>
+Author: Chunhao Huang @ Winbond
 
 
 Module Parameters
@@ -264,6 +264,6 @@ additional entries for chassis intrusion detection:
  
 Author/Maintainer
 -----------------
-Original 792D support: Chunhao Huang(huang0@winbond.com.tw)
+Original 792D support: Chunhao Huang
 subclients register added by: Mark D. Studebaker(mdsxyz123@yahoo.com)
 and modified by Jean Delvare <khali@linux-fr.org>.
diff --git a/kernel/busses/i2c-ali1563.c b/kernel/busses/i2c-ali1563.c
index 0bc22fc2..783e959d 100644
--- a/kernel/busses/i2c-ali1563.c
+++ b/kernel/busses/i2c-ali1563.c
@@ -12,7 +12,7 @@
  *	This driver is based on a mix of the 15x3, 1535, and i801 drivers,
  *	with a little help from the ALi 1563 spec.
  *
- *	Chunhao Huang <huang0@winbond.com.tw>
+ *	Chunhao Huang / Winbond
  *	Backport to linux-2.4 from linux-2.6 on Mar.2005
  *
  *	This file is released under the GPLv2
@@ -459,7 +459,7 @@ static void __exit ali1563_exit(void)
 
 module_exit(ali1563_exit);
 
-MODULE_AUTHOR("Patrick Mochel <mochel@digitalimplant.org>, Chunhao Huang <huang0@winbond.com.tw>");
+MODULE_AUTHOR("Patrick Mochel <mochel@digitalimplant.org>, Chunhao Huang");
 MODULE_DESCRIPTION("ALi M1563 southbridge driver for linux-2.4, backported by Chunhao Huang from linux-2.6");
 MODULE_LICENSE("GPL");
 
diff --git a/kernel/chips/w83792d.c b/kernel/chips/w83792d.c
index dab0c0aa..d7da3272 100644
--- a/kernel/chips/w83792d.c
+++ b/kernel/chips/w83792d.c
@@ -2,7 +2,7 @@
     w83792d.c - Part of lm_sensors, Linux kernel modules for hardware
                 monitoring
     Copyright (c) 2004, 2005 Winbond Electronics Corp.
-                  Chunhao Huang <huang0@winbond.com.tw>
+                  Chunhao Huang
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1521,7 +1521,7 @@ static void __exit sm_w83792d_exit(void)
 }
 
 
-MODULE_AUTHOR("Chunhao Huang @ Winbond <huang0@winbond.com.tw>");
+MODULE_AUTHOR("Chunhao Huang @ Winbond");
 MODULE_DESCRIPTION("W83792AD/D driver for linux-2.4");
 MODULE_LICENSE("GPL");