diff --git a/Classes/PHPExcel/Shared/CodePage.php b/Classes/PHPExcel/Shared/CodePage.php
index 2d79b9ee..00753a08 100644
--- a/Classes/PHPExcel/Shared/CodePage.php
+++ b/Classes/PHPExcel/Shared/CodePage.php
@@ -46,47 +46,53 @@ class PHPExcel_Shared_CodePage
 	public static function NumberToName($codePage = '1252')
 	{
 		switch ($codePage) {
-			case 367:	return 'ASCII';		break;	//	ASCII
-			case 437:	return 'CP437';		break;	//	OEM US
+			case 367:	return 'ASCII';				break;	//	ASCII
+			case 437:	return 'CP437';				break;	//	OEM US
 			case 720:	throw new Exception('Code page 720 not supported.');
-											break;	//	OEM Arabic
-			case 737:	return 'CP737';		break;	//	OEM Greek
-			case 775:	return 'CP775';		break;	//	OEM Baltic
-			case 850:	return 'CP850';		break;	//	OEM Latin I
-			case 852:	return 'CP852';		break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';		break;	//	OEM Cyrillic
-			case 857:	return 'CP857';		break;	//	OEM Turkish
-			case 858:	return 'CP858';		break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';		break;	//	OEM Portugese
-			case 861:	return 'CP861';		break;	//	OEM Icelandic
-			case 862:	return 'CP862';		break;	//	OEM Hebrew
-			case 863:	return 'CP863';		break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';		break;	//	OEM Arabic
-			case 865:	return 'CP865';		break;	//	OEM Nordic
-			case 866:	return 'CP866';		break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';		break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';		break;	//	ANSI Thai
-			case 932:	return 'CP932';		break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';		break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';		break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';		break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';	break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';	break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';	break;	//	ANSI Cyrillic
-			case 0:									//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';	break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';	break;	//	ANSI Greek
-			case 1254:	return 'CP1254';	break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';	break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';	break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';	break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';	break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';	break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';		break;	//	Apple Roman
-			case 32768:	return 'MAC';		break;	//	Apple Roman
+													break;	//	OEM Arabic
+			case 737:	return 'CP737';				break;	//	OEM Greek
+			case 775:	return 'CP775';				break;	//	OEM Baltic
+			case 850:	return 'CP850';				break;	//	OEM Latin I
+			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
+			case 855:	return 'CP855';				break;	//	OEM Cyrillic
+			case 857:	return 'CP857';				break;	//	OEM Turkish
+			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
+			case 860:	return 'CP860';				break;	//	OEM Portugese
+			case 861:	return 'CP861';				break;	//	OEM Icelandic
+			case 862:	return 'CP862';				break;	//	OEM Hebrew
+			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
+			case 864:	return 'CP864';				break;	//	OEM Arabic
+			case 865:	return 'CP865';				break;	//	OEM Nordic
+			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
+			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
+			case 874:	return 'CP874';				break;	//	ANSI Thai
+			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
+			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
+			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
+			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
+			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
+			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
+			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
+			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
+			case 1253:	return 'CP1253';			break;	//	ANSI Greek
+			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
+			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
+			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
+			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
+			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
+			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
+			case 10000:	return 'MAC';				break;	//	Apple Roman
+			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
+			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
+			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
+			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
+			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
+			case 32768:	return 'MAC';				break;	//	Apple Roman
 			case 32769:	throw new Exception('Code page 32769 not supported.');
-											break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65001:	return 'UTF-8';		break;	//	Unicode (UTF-8)
+													break;	//	ANSI Latin I (BIFF2-BIFF3)
+			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
+			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
 		}
 
 		throw new Exception('Unknown codepage: ' . $codePage);
diff --git a/changelog.txt b/changelog.txt
index a6e598a4..ea0a0a27 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -52,6 +52,8 @@ Fixed in SVN:
 - General:  (MBaker)    Ensure use of system temp directory for all temporary work files, unless explicitly specified
 - General:  (char101)   Work item 16359 - [Patch] faster stringFromColumnIndex()
 - General:  (whit1206)  Work item 16028 - Fix for projects that still use old autoloaders
+- General:  (atz)       Work item 17024 - Unknown codepage: 10007
+                        Additional Mac codepages
 
 
 2011-02-27 (v1.7.6):