diff --git a/src/documentation/xdocs/who.xml b/src/documentation/xdocs/who.xml
index 504fbbf5f4..b1cfbd88e0 100644
--- a/src/documentation/xdocs/who.xml
+++ b/src/documentation/xdocs/who.xml
@@ -47,11 +47,11 @@
       <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
       <li>Ryan Ackley (sackley at apache dot org)</li>
       <li>Avik Sengupta (avik at apache dot org)</li>
+      <li>Shawn Laubach (slaubach at apache dot org)</li>
     </ul>
   </section>
   <section title="Developers">
     <ul>
-      <li>Shawn Laubach (shawnlaubach at cox dot net)</li>
       <li>Jason Height (jheight at chariot dot net dot au)</li>
     </ul>
   </section>
diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index ff1ebab8e9..6e7abd01a8 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -79,7 +79,7 @@ import org.apache.poi.hssf.record
  * <P>
  * @author  Andrew C. Oliver (acoliver at apache dot org)
  * @author  Glen Stampoultzis (glens at apache.org)
- * @author  Shawn Laubach (laubach at acm.org) Just Gridlines, Headers, Footers, and PrintSetup
+ * @author  Shawn Laubach (slaubach at apache dot org) Gridlines, Headers, Footers, and PrintSetup
  * @author Jason Height (jheight at chariot dot net dot au) Clone support
  *
  * @see org.apache.poi.hssf.model.Workbook
diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index 4e49a1543b..e7deae3dce 100644
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -84,7 +84,7 @@ import org.apache.poi.hssf.util.HSSFColor;
  * Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
  * before even attempting to use this.
  *
- * @author  Shawn Laubach (shawnlaubach at cox.net) (Data Formats)
+ * @author  Shawn Laubach (slaubach at apache dot org) (Data Formats)
  * @author  Andrew C. Oliver (acoliver at apache dot org)
  * @author  Glen Stampoultzis (glens at apache.org)
  * @author  Sergei Kozello (sergeikozello at mail.ru)
diff --git a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
index 24793c8cc2..faa5cef4e7 100644
--- a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.*;
 /**
  * Record for the bottom margin.
  * NOTE: This source was automatically generated.
- * @author Shawn Laubach (shawnlaubach at cox.net)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class BottomMarginRecord
     extends Record implements Margin
diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/src/java/org/apache/poi/hssf/record/FooterRecord.java
index cd3abb2e29..879a9036a0 100644
--- a/src/java/org/apache/poi/hssf/record/FooterRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FooterRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.StringUtil;
  * Description:  Specifies the footer for a sheet<P>
  * REFERENCE:  PG 317 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Shawn Laubach (laubach@acm.org) Modified 3/14/02
+ * @author Shawn Laubach (slaubach at apache dot org) Modified 3/14/02
  * @author Jason Height (jheight at chariot dot net dot au)
  * @version 2.0-pre
  */
diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java
index 5a72c9be41..5dd1b01572 100644
--- a/src/java/org/apache/poi/hssf/record/FormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java
@@ -64,7 +64,7 @@ import org.apache.poi.util.StringUtil;
  *
  * REFERENCE:  PG 317 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Shawn M. Laubach (shawnlaubach at cox dot net)  
+ * @author Shawn M. Laubach (slaubach at apache dot org)  
  * @version 2.0-pre
  */
 
diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/src/java/org/apache/poi/hssf/record/HeaderRecord.java
index 897af1273a..3883317fb7 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HeaderRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.StringUtil;
  * Description:  Specifies a header for a sheet<P>
  * REFERENCE:  PG 321 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Shawn Laubach (laubach@acm.org) Modified 3/14/02
+ * @author Shawn Laubach (slaubach at apache dot org) Modified 3/14/02
  * @author Jason Height (jheight at chariot dot net dot au)
  * @version 2.0-pre
  */
diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
index 42a9837340..17c26639a3 100644
--- a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.*;
 /**
  * Record for the left margin.
  * NOTE: This source was automatically generated.
- * @author Shawn Laubach (shawnlaubach at cox.net)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class LeftMarginRecord
     extends Record implements Margin
diff --git a/src/java/org/apache/poi/hssf/record/Margin.java b/src/java/org/apache/poi/hssf/record/Margin.java
index cc63ff2f40..34e74f7bac 100644
--- a/src/java/org/apache/poi/hssf/record/Margin.java
+++ b/src/java/org/apache/poi/hssf/record/Margin.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.*;
  * The margin interface is a parent used to define left, right, top and bottom margins.  This allows much of the code to be generic when it comes to handling margins.
  * NOTE: This source wass automatically generated.
 
- * @author Shawn Laubach (shawnlaubach at cox.net)
+ * @author Shawn Laubach (slaubach at apache dot org) 
  */
 public interface Margin
 {
diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
index 4e01d7b69d..00e9ba5216 100644
--- a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.*;
 /**
  * Record for the right margin.
  * NOTE: This source was automatically generated.
- * @author Shawn Laubach (shawnlaubach at cox.net)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class RightMarginRecord
     extends Record implements Margin
diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
index 75828daebe..7126cae4eb 100644
--- a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.*;
 /**
  * Record for the top margin.
  * NOTE: This source was automatically generated.
- * @author Shawn Laubach (shawnlaubach at cox.net)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class TopMarginRecord
     extends Record implements Margin
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java b/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
index afcea465da..146e1890b3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
@@ -67,7 +67,7 @@ import org.apache.poi.hssf.record.FooterRecord;
  * that return the characters used to represent these.  One can also change the
  * fonts by using similar methods.
  * <P>
- * @author Shawn Laubach (laubach@acm.org)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class HSSFFooter extends Object {
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java b/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
index ca67875715..95efb0aa6e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
@@ -66,7 +66,7 @@ import org.apache.poi.hssf.record.HeaderRecord;
  * that return the characters used to represent these.  One can also change the
  * fonts by using similar methods.
  * <P>
- * @author Shawn Laubach (laubach@acm.org)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class HSSFHeader extends Object {
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
index c8e2eec9ec..c1f51b49df 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
@@ -59,7 +59,7 @@ import org.apache.poi.hssf.record.PrintSetupRecord;
 /**
  * Used to modify the print setup.
  * <P>
- * @author Shawn Laubach (laubach@acm.org)
+ * @author Shawn Laubach (slaubach at apache dot org)
  */
 public class HSSFPrintSetup extends Object {
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 0cedfc2b04..031fabea9d 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -79,7 +79,7 @@ import java.util.TreeMap;
  * @author  Andrew C. Oliver (acoliver at apache dot org)
  * @author  Glen Stampoultzis (glens at apache.org)
  * @author  Libin Roman (romal at vistaportal.com)
- * @author  Shawn Laubach (laubach at acm.org) (Just a little)
+ * @author  Shawn Laubach (slaubach at apache dot org) (Just a little)
  */
 
 public class HSSFSheet
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index 99ee6fb388..3a75604d8c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -87,7 +87,7 @@ import java.util.Iterator;
  * @see org.apache.poi.hssf.usermodel.HSSFSheet
  * @author  Andrew C. Oliver (acoliver at apache dot org)
  * @author  Glen Stampoultzis (glens at apache.org)
- * @author  Shawn Laubach (shawnlaubach at cox.net)
+ * @author  Shawn Laubach (slaubach at apache dot org)
  * @version 2.0-pre
  */