diff --git a/Classes/PHPExcel/Cell.php b/Classes/PHPExcel/Cell.php
index af28cf34..4a588a26 100644
--- a/Classes/PHPExcel/Cell.php
+++ b/Classes/PHPExcel/Cell.php
@@ -498,7 +498,7 @@ class PHPExcel_Cell
 	 */
 	public static function coordinateFromString($pCoordinateString = 'A1')
 	{
-		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,5})$/", $pCoordinateString, $matches)) {
+		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
 			return array($matches[1],$matches[2]);
 		} elseif ((strpos($pCoordinateString,':') !== false) || (strpos($pCoordinateString,',') !== false)) {
 			throw new Exception('Cell coordinate string can not be a range of cells.');
diff --git a/changelog.txt b/changelog.txt
index 98e2a6f9..9b709624 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -33,6 +33,7 @@ Fixed in SVN:
 - Bugfix:	(MBaker) Work item 14973 - PHPExcel_Cell::isInRange() incorrect results - offset by one column
 - Bugfix:   (MBaker) Treat CodePage of 0 as CP1251 (for .xls files written by applications that don't set the CodePage correctly, such as Apple Numbers)
 - Bugfix:	(MB) Work item 11583 - Need method for removing autoFilter 
+- Bugfix:	(MBaker) Work item 15029 - coordinateFromString throws exception for rows greater than 99,999 
 
 
 2010-12-10 (v1.7.5):