diff --git a/Classes/PHPExcel/Shared/Date.php b/Classes/PHPExcel/Shared/Date.php
index 656c357a..d7b8609d 100644
--- a/Classes/PHPExcel/Shared/Date.php
+++ b/Classes/PHPExcel/Shared/Date.php
@@ -253,7 +253,7 @@ class PHPExcel_Shared_Date
 	}	//	function isDateTimeFormat()
 
 
-	private static	$possibleDateFormatCharacters = 'ymdHs';
+	private static	$possibleDateFormatCharacters = 'eymdHs';
 
 	/**
 	 * Is a given number format code a date/time?
diff --git a/Classes/PHPExcel/Style/NumberFormat.php b/Classes/PHPExcel/Style/NumberFormat.php
index 783cf359..1b57959e 100644
--- a/Classes/PHPExcel/Style/NumberFormat.php
+++ b/Classes/PHPExcel/Style/NumberFormat.php
@@ -460,6 +460,7 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 			//	12-hour suffix
 			'am/pm'	=> 'A',
 			//	4-digit year
+			'e'	=> 'Y',
 			'yyyy'	=> 'Y',
 			//	2-digit year
 			'yy'	=> 'y',
diff --git a/changelog.txt b/changelog.txt
index 582dfb5d..ed79edc9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -31,7 +31,8 @@ Fixed in SVN:
 - Feature:  (MBaker)     Initial version of HTML Reader
 - Bugfix:   (cyberconte) Patch 12318 - OOCalc cells containing <text:span> inside the <text:p> tag
 - Bugfix:   (schir1964)  Fix to listWorksheetInfo() method for OOCalc Reader
-
+- Bugfix:   (MBaker)     Support for "e" (epoch) date format mask
+                         Rendered as a 4-digit CE year in non-Excel outputs
 
 2012-05-19 (v1.7.7):
 - Bugfix:   (Progi1984) Work item 8916 - Support for Rich-Text in PHPExcel_Writer_Excel5