diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 548a6931..f784b5c6 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -52,7 +52,7 @@
      Rx ring contents by dumping the 2K FIFO contents right where we wanted to
      get the next packet.  Oh well, what fun.
 
-  18 Jan 2000   mdc@thinguin.org (Marty Connor)
+  18 Jan 2000   mdc@etherboot.org (Marty Connor)
      Drastically simplified error handling.  Basically, if any error
      in transmission or reception occurs, the card is reset.
      Also, pointed all transmit descriptors to the same buffer to
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 3bf7a835..a891ad40 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -6,7 +6,7 @@
 
    Revision:	1.0	March 1, 2001
    
-   Author: Marty Connor (mdc@thinguin.org)
+   Author: Marty Connor (mdc@etherboot.org)
 
    Adapted from a Linux driver which was written by Donald Becker
    and modified by Ollie Lho and Chin-Shan Li of SiS Corporation.
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 4b525848..90de7a71 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -3,7 +3,7 @@
 /*
   Tulip and clone Etherboot Driver
 
-  By Marty Connor (mdc@thinguin.org)
+  By Marty Connor (mdc@etherboot.org)
   Copyright (C) 2001 Entity Cyber, Inc.
 
   This software may be used and distributed according to the terms
diff --git a/src/drivers/net/tulip.txt b/src/drivers/net/tulip.txt
index 68b7b3b7..b4f6756d 100644
--- a/src/drivers/net/tulip.txt
+++ b/src/drivers/net/tulip.txt
@@ -42,12 +42,13 @@ will help the next person who hacks the code or needs to support some
 tulip clone card, or wishes to add functionality.
 
 Anyway, please test this if you can on your tulip based card, and let
-me (mdc@thinguin.org) and the netboot list (netboot@baghira.han.de)
-know how things go.  I also would appreciate code review by people who
-program.  I'm a strong believer in "another set of eyes".
+me (mdc@etherboot.org) and the Etherboot-Discuss list
+(etherboot-discuss@lists.sourceforge.net) know how things go.  I also
+would appreciate code review by people who program.  I'm a strong
+believer in "another set of eyes".
 
 Regards,
 
 Marty Connor
-mdc@thinguin.org
-http://www.thinguin.org/
+mdc@etherboot.org
+http://www.etherboot.org/