diff --git a/src/documentation/xdocs/who.xml b/src/documentation/xdocs/who.xml
index ad24487d7..250bbb77b 100644
--- a/src/documentation/xdocs/who.xml
+++ b/src/documentation/xdocs/who.xml
@@ -46,7 +46,7 @@
   </s2>
   <s2 title="Developers">
     <ul>
-      <li>Glen Stampoultzis (gstamp at iprimus dot com dot au)</li>
+      <li>Glen Stampoultzis (glens at apache.org)</li>
       <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
     </ul>
   </s2>
diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
index f95556f13..a9557b4ef 100644
--- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java
@@ -79,7 +79,7 @@ import org.apache.poi.hssf.usermodel.*;
 /**
  * Utillity for reading in BIFF8 records and displaying data from them.
  * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @see #main
  */
 
diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index d2437c8ef..004a4b85b 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -83,7 +83,7 @@ import org.apache.poi.hssf.record
  * before even attempting to use this.
  * <P>
  * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  * @see org.apache.poi.hssf.model.Workbook
  * @see org.apache.poi.hssf.usermodel.HSSFSheet
  * @version 1.0-pre
diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index 271f1b891..e839f0d83 100644
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -80,7 +80,7 @@ import org.apache.poi.hssf.HSSFLog;
  * before even attempting to use this.
  *
  * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  * @see org.apache.poi.hssf.usermodel.HSSFWorkbook
  * @version 1.0-pre
  */
diff --git a/src/java/org/apache/poi/hssf/record/AreaRecord.java b/src/java/org/apache/poi/hssf/record/AreaRecord.java
index a43969bb5..6e4f89f76 100644
--- a/src/java/org/apache/poi/hssf/record/AreaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/AreaRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class AreaRecord
     extends Record
diff --git a/src/java/org/apache/poi/hssf/record/BarRecord.java b/src/java/org/apache/poi/hssf/record/BarRecord.java
index b01368cd6..309ed9c15 100644
--- a/src/java/org/apache/poi/hssf/record/BarRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BarRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class BarRecord
     extends Record
diff --git a/src/java/org/apache/poi/hssf/record/BeginRecord.java b/src/java/org/apache/poi/hssf/record/BeginRecord.java
index ec27b9c37..2e2fbc4d0 100644
--- a/src/java/org/apache/poi/hssf/record/BeginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BeginRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @see EndRecord
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class BeginRecord
diff --git a/src/java/org/apache/poi/hssf/record/ChartRecord.java b/src/java/org/apache/poi/hssf/record/ChartRecord.java
index 30a8981cd..32ecacf14 100644
--- a/src/java/org/apache/poi/hssf/record/ChartRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ChartRecord.java
@@ -65,7 +65,7 @@ import org.apache.poi.util.LittleEndian;
  * This is currently based on BIFF4 but will up updated to take into
  * account changed required by BIFF8.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class ChartRecord
diff --git a/src/java/org/apache/poi/hssf/record/DatRecord.java b/src/java/org/apache/poi/hssf/record/DatRecord.java
index 9121ce3f5..fd62a3ef1 100644
--- a/src/java/org/apache/poi/hssf/record/DatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DatRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class DatRecord
     extends Record
diff --git a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java b/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
index 6aa5c8a22..2f143bce6 100644
--- a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class DataFormatRecord
     extends Record
diff --git a/src/java/org/apache/poi/hssf/record/EndRecord.java b/src/java/org/apache/poi/hssf/record/EndRecord.java
index fba75ef9a..d632ab325 100644
--- a/src/java/org/apache/poi/hssf/record/EndRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EndRecord.java
@@ -63,7 +63,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @see BeginRecord
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class EndRecord
diff --git a/src/java/org/apache/poi/hssf/record/FrameRecord.java b/src/java/org/apache/poi/hssf/record/FrameRecord.java
index 89cdbbb81..ad980f22c 100644
--- a/src/java/org/apache/poi/hssf/record/FrameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FrameRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class FrameRecord
     extends Record
@@ -186,7 +186,7 @@ public class FrameRecord
     /**
      * Get the border type field for the Frame record.
      *
-     * @return  One of 
+     * @return  One of
      *        BORDER_TYPE_REGULAR
      *        BORDER_TYPE_SHADOW
      */
@@ -199,7 +199,7 @@ public class FrameRecord
      * Set the border type field for the Frame record.
      *
      * @param field_1_borderType
-     *        One of 
+     *        One of
      *        BORDER_TYPE_REGULAR
      *        BORDER_TYPE_SHADOW
      */
diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/src/java/org/apache/poi/hssf/record/GridsetRecord.java
index 1cf42aa43..b4a3faba9 100644
--- a/src/java/org/apache/poi/hssf/record/GridsetRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GridsetRecord.java
@@ -64,7 +64,7 @@ import org.apache.poi.util.LittleEndian;
  * REFERENCE:  PG 320 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
  *
  * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  *
  * @version 2.0-pre
  */
diff --git a/src/java/org/apache/poi/hssf/record/LegendRecord.java b/src/java/org/apache/poi/hssf/record/LegendRecord.java
index 5f5e73d69..740b86687 100644
--- a/src/java/org/apache/poi/hssf/record/LegendRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LegendRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class LegendRecord
     extends Record
@@ -305,7 +305,7 @@ public class LegendRecord
     /**
      * Get the type field for the Legend record.
      *
-     * @return  One of 
+     * @return  One of
      *        TYPE_BOTTOM
      *        TYPE_CORNER
      *        TYPE_TOP
@@ -322,7 +322,7 @@ public class LegendRecord
      * Set the type field for the Legend record.
      *
      * @param field_5_type
-     *        One of 
+     *        One of
      *        TYPE_BOTTOM
      *        TYPE_CORNER
      *        TYPE_TOP
@@ -338,7 +338,7 @@ public class LegendRecord
     /**
      * Get the spacing field for the Legend record.
      *
-     * @return  One of 
+     * @return  One of
      *        SPACING_CLOSE
      *        SPACING_MEDIUM
      *        SPACING_OPEN
@@ -352,7 +352,7 @@ public class LegendRecord
      * Set the spacing field for the Legend record.
      *
      * @param field_6_spacing
-     *        One of 
+     *        One of
      *        SPACING_CLOSE
      *        SPACING_MEDIUM
      *        SPACING_OPEN
diff --git a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java b/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
index 25a5f68f2..2af130c75 100644
--- a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class PlotGrowthRecord
     extends Record
diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/src/java/org/apache/poi/hssf/record/RecordFactory.java
index 4b1400a87..e3a6b18ea 100644
--- a/src/java/org/apache/poi/hssf/record/RecordFactory.java
+++ b/src/java/org/apache/poi/hssf/record/RecordFactory.java
@@ -71,7 +71,7 @@ import org.apache.poi.util.HexDump;
  *
  * @author Andrew C. Oliver (acoliver at apache dot org)
  * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @version 1.0-pre
  */
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesRecord.java b/src/java/org/apache/poi/hssf/record/SeriesRecord.java
index 6225b0e31..ce3f20979 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SeriesRecord.java
@@ -68,7 +68,7 @@ import org.apache.poi.util.HexDump;
  * NOTE: This source is automatically generated please do not modify this file.  Either subclass or
  *       remove the record in src/records/definitions.
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class SeriesRecord
     extends Record
@@ -224,7 +224,7 @@ public class SeriesRecord
     /**
      * Get the category data type field for the Series record.
      *
-     * @return  One of 
+     * @return  One of
      *        CATEGORY_DATA_TYPE_DATES
      *        CATEGORY_DATA_TYPE_NUMERIC
      *        CATEGORY_DATA_TYPE_SEQUENCE
@@ -239,7 +239,7 @@ public class SeriesRecord
      * Set the category data type field for the Series record.
      *
      * @param field_1_categoryDataType
-     *        One of 
+     *        One of
      *        CATEGORY_DATA_TYPE_DATES
      *        CATEGORY_DATA_TYPE_NUMERIC
      *        CATEGORY_DATA_TYPE_SEQUENCE
@@ -253,7 +253,7 @@ public class SeriesRecord
     /**
      * Get the values data type field for the Series record.
      *
-     * @return  One of 
+     * @return  One of
      *        VALUES_DATA_TYPE_DATES
      *        VALUES_DATA_TYPE_NUMERIC
      *        VALUES_DATA_TYPE_SEQUENCE
@@ -268,7 +268,7 @@ public class SeriesRecord
      * Set the values data type field for the Series record.
      *
      * @param field_2_valuesDataType
-     *        One of 
+     *        One of
      *        VALUES_DATA_TYPE_DATES
      *        VALUES_DATA_TYPE_NUMERIC
      *        VALUES_DATA_TYPE_SEQUENCE
@@ -314,7 +314,7 @@ public class SeriesRecord
     /**
      * Get the bubble series type field for the Series record.
      *
-     * @return  One of 
+     * @return  One of
      *        BUBBLE_SERIES_TYPE_DATES
      *        BUBBLE_SERIES_TYPE_NUMERIC
      *        BUBBLE_SERIES_TYPE_SEQUENCE
@@ -329,7 +329,7 @@ public class SeriesRecord
      * Set the bubble series type field for the Series record.
      *
      * @param field_5_bubbleSeriesType
-     *        One of 
+     *        One of
      *        BUBBLE_SERIES_TYPE_DATES
      *        BUBBLE_SERIES_TYPE_NUMERIC
      *        BUBBLE_SERIES_TYPE_SEQUENCE
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
index 9545cc372..ac8bd9350 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
@@ -68,7 +68,7 @@ import java.util.TreeMap;
  * Aggregate value records together.  Things are easier to handle that way.
  *
  * @author  andy
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  */
 
 public class ValueRecordsAggregate
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
index 8d8611a8e..4a6caf10a 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
@@ -68,7 +68,7 @@ import java.util.GregorianCalendar;
  * Contains methods for dealing with Excel dates.
  *
  * @author  Michael Harhen
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  */
 
 public class HSSFDateUtil
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index e20c65d9a..a9b1bab21 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -73,7 +73,7 @@ import java.util.TreeMap;
 /**
  * High level representation of a worksheet.
  * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  * @version 1.0-pre
  */
 
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index 6133d75ff..d664e9a5e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -83,7 +83,7 @@ import org.apache.poi.hssf.record.*;
  * @see org.apache.poi.hssf.model.Workbook
  * @see org.apache.poi.hssf.usermodel.HSSFSheet
  * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  * @version 2.0-pre
  */
 
diff --git a/src/java/org/apache/poi/util/POILogger.java b/src/java/org/apache/poi/util/POILogger.java
index 87f0efac0..1b3186b6c 100644
--- a/src/java/org/apache/poi/util/POILogger.java
+++ b/src/java/org/apache/poi/util/POILogger.java
@@ -67,7 +67,7 @@ import java.util.*;
  * message.<p>
  *
  * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class POILogger
diff --git a/src/records/definitions/area_record.xml b/src/records/definitions/area_record.xml
index efb323926..c8519edb1 100644
--- a/src/records/definitions/area_record.xml
+++ b/src/records/definitions/area_record.xml
@@ -1,6 +1,6 @@
 <record id="0x101A" name="Area" package="org.apache.poi.hssf.record">
     <description>The area record is used to define a area chart.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="format flags">
             <bit number="0" name="stacked" description="series is stacked"/>
diff --git a/src/records/definitions/bar_record.xml b/src/records/definitions/bar_record.xml
index 41aff58ab..2b8649f7a 100644
--- a/src/records/definitions/bar_record.xml
+++ b/src/records/definitions/bar_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1017" name="Bar" package="org.apache.poi.hssf.record">
     <description>The bar record is used to define a bar chart.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="bar space" description="space between bars"/>
         <field type="int" size="2" name="category space" default="50" description="space between categories"/>
diff --git a/src/records/definitions/dat_record.xml b/src/records/definitions/dat_record.xml
index 2497eca85..789eead50 100644
--- a/src/records/definitions/dat_record.xml
+++ b/src/records/definitions/dat_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1063" name="Dat" package="org.apache.poi.hssf.record">
     <description>The dat record is used to store options for the chart.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="options">
             <bit number="0" name="horizontal border" description="has a horizontal border"/>
diff --git a/src/records/definitions/dataformat_record.xml b/src/records/definitions/dataformat_record.xml
index a56f6102b..dc015fbf6 100644
--- a/src/records/definitions/dataformat_record.xml
+++ b/src/records/definitions/dataformat_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1006" name="DataFormat" package="org.apache.poi.hssf.record">
     <description>The data format record is used to index into a series.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="point number" description="0xFFFF for entire series"/>
         <field type="int" size="2" name="series index" description="relative index"/>
diff --git a/src/records/definitions/font_example.xml b/src/records/definitions/font_example.xml
index f077ac973..7cdba9381 100644
--- a/src/records/definitions/font_example.xml
+++ b/src/records/definitions/font_example.xml
@@ -1,6 +1,6 @@
 <record id="0x31" name="Font" package="org.apache.poi.hssf.records">
     <description>Describes a font record.  In Excel a font belongs in the font table.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="font height"/>
         <field type="bits" size="2" name="attributes">
diff --git a/src/records/definitions/frame_record.xml b/src/records/definitions/frame_record.xml
index b7a63c41e..4daaee03c 100644
--- a/src/records/definitions/frame_record.xml
+++ b/src/records/definitions/frame_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1032" name="Frame" package="org.apache.poi.hssf.record">
     <description>The frame record indicates whether there is a border around the displayed text of a chart.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="border type">
             <const name="regular" value="0" description="regular rectangle or no border"/>
diff --git a/src/records/definitions/legend_record.xml b/src/records/definitions/legend_record.xml
index 732f6f35d..4b7e74c1b 100644
--- a/src/records/definitions/legend_record.xml
+++ b/src/records/definitions/legend_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1015" name="Legend" package="org.apache.poi.hssf.record">
     <description>The legend record specifies the location of legend on a chart and it's overall size.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="4" name="x position"/>
         <field type="int" size="4" name="y position"/>
diff --git a/src/records/definitions/plotgrowth_record.xml b/src/records/definitions/plotgrowth_record.xml
index b5ab94afb..493c6dc6d 100644
--- a/src/records/definitions/plotgrowth_record.xml
+++ b/src/records/definitions/plotgrowth_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1064" name="PlotGrowth" package="org.apache.poi.hssf.record">
     <description>The plot growth record specifies the scaling factors used when a font is scaled.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="4" name="horizontalScale"/>
         <field type="int" size="4" name="verticalScale"/>
diff --git a/src/records/definitions/series_record.xml b/src/records/definitions/series_record.xml
index eccf92c3e..87b2ece23 100644
--- a/src/records/definitions/series_record.xml
+++ b/src/records/definitions/series_record.xml
@@ -1,6 +1,6 @@
 <record id="0x1003" name="Series" package="org.apache.poi.hssf.record">
     <description>The series record describes the overall data for a series.</description>
-    <author>Glen Stampoultzis (gstamp at iprimus dot com dot au)</author>
+    <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="category data type">
             <const name="dates" value="0"/>
diff --git a/src/scratchpad/src/org/apache/poi/generator/FieldIterator.java b/src/scratchpad/src/org/apache/poi/generator/FieldIterator.java
index f419f5af6..7db42b942 100644
--- a/src/scratchpad/src/org/apache/poi/generator/FieldIterator.java
+++ b/src/scratchpad/src/org/apache/poi/generator/FieldIterator.java
@@ -58,7 +58,7 @@ package org.apache.poi.generator;
 /**
  * For iterating through our fields.  Todo: Change this to javascript in the style sheet.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class FieldIterator
 {
diff --git a/src/scratchpad/src/org/apache/poi/generator/RecordUtil.java b/src/scratchpad/src/org/apache/poi/generator/RecordUtil.java
index 64660e5a9..8645d77f0 100644
--- a/src/scratchpad/src/org/apache/poi/generator/RecordUtil.java
+++ b/src/scratchpad/src/org/apache/poi/generator/RecordUtil.java
@@ -59,7 +59,7 @@ package org.apache.poi.generator;
  * Helper functions for the record transformations. TODO: Change this to
  * javascript in the style sheet.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class RecordUtil
 {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
index decbedc77..aeb4d250b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
  * Excel file.
  *
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestAreaRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java b/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
index 9d9b78cc7..4cfd3a0d3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
  * Excel file.
  *
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestBarRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
index 3c6bdc7ba..df8f8f774 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
  * Excel file.
  *
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestDatRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
index 36f07c14f..e44cf26dd 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
  * Excel file.
  *
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestDataFormatRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
index ffa47d41b..ca7083c90 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
  * Excel file.
  *
 
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestFrameRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java b/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
index ca719e048..33544d694 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
@@ -61,7 +61,7 @@ import junit.framework.TestCase;
  * class works correctly.  Test data taken directly from a real
  * Excel file.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestLegendRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
index 0a1ede490..bcc4d51f2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
@@ -64,7 +64,7 @@ import junit.framework.TestCase;
  * class works correctly.  Test data taken directly from a real
  * Excel file.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestPlotGrowthRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
index be582ab1e..44daeab17 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
@@ -59,7 +59,7 @@ import junit.framework.TestCase;
 
 /**
  * Tests the record factory
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @author Andrew C. Oliver (acoliver at apache dot org)
  */
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
index 2d1881f4e..eb0bc9033 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
@@ -64,7 +64,7 @@ import junit.framework.TestCase;
  * class works correctly.  Test data taken directly from a real
  * Excel file.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 public class TestSeriesRecord
         extends TestCase
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
index 1c53b1c07..3d175ee77 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
@@ -72,7 +72,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 
 /**
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class TestReadWriteChart
diff --git a/src/testcases/org/apache/poi/util/TestPOILogFactory.java b/src/testcases/org/apache/poi/util/TestPOILogFactory.java
index 6e57520a1..0cb3fa107 100644
--- a/src/testcases/org/apache/poi/util/TestPOILogFactory.java
+++ b/src/testcases/org/apache/poi/util/TestPOILogFactory.java
@@ -63,7 +63,7 @@ import java.io.*;
 
 /**
  * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  */
 
 public class TestPOILogFactory
diff --git a/src/testcases/org/apache/poi/util/TestPOILogger.java b/src/testcases/org/apache/poi/util/TestPOILogger.java
index b3c112802..2fcf0a636 100644
--- a/src/testcases/org/apache/poi/util/TestPOILogger.java
+++ b/src/testcases/org/apache/poi/util/TestPOILogger.java
@@ -63,7 +63,7 @@ import java.io.FileInputStream;
 /**
  * Tests the log class.
  *
- * @author Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author Glen Stampoultzis (glens at apache.org)
  * @author Marc Johnson (mjohnson at apache dot org)
  */
 
diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/src/testcases/org/apache/poi/util/TestStringUtil.java
index dcb6c2539..c80bce432 100644
--- a/src/testcases/org/apache/poi/util/TestStringUtil.java
+++ b/src/testcases/org/apache/poi/util/TestStringUtil.java
@@ -63,7 +63,7 @@ import java.text.NumberFormat;
  * Unit test for StringUtil
  *
  * @author  Marc Johnson (mjohnson at apache dot org
- * @author  Glen Stampoultzis (gstamp at iprimus dot com dot au)
+ * @author  Glen Stampoultzis (glens at apache.org)
  */
 
 public class TestStringUtil