diff --git a/ChangeLog b/ChangeLog
index 4617f2569..02a74f94b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-29 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+	* Headers/Foundation/NSString.h
+	  make NSStringEncoding enum typdef to NSUInteger
+	* Source/Additions/Unicode.m
+	  fix format string to print out NSStringEncoding
+
 2013-05-17  Ivan Vučica <ivan@vucica.net>
 
 	* Source/NSDate.m:
diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h
index 5097d4e61..73a3ad038 100644
--- a/Headers/Foundation/NSString.h
+++ b/Headers/Foundation/NSString.h
@@ -148,7 +148,7 @@ typedef NSUInteger NSStringCompareOptions;
  *  NSGSM0338StringEncoding, NSBIG5StringEncoding,
  *  NSKoreanEUCStringEncoding</code>.</p>
  */
-typedef enum _NSStringEncoding
+enum
 {
 /* NB. Must not have an encoding with value zero - so we can use zero to
    tell that a variable that should contain an encoding has not yet been
@@ -204,7 +204,8 @@ typedef enum _NSStringEncoding
   NSUTF32BigEndianStringEncoding = 0x98000100,
   NSUTF32LittleEndianStringEncoding = 0x9c000100
 #endif
-} NSStringEncoding;
+};
+typedef NSUInteger NSStringEncoding;
 
 enum {
   NSOpenStepUnicodeReservedBase = 0xF400
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index 37eeab83a..ba30209b5 100644
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@@ -1350,7 +1350,7 @@ tables:
 	   */
 	  if (estr == 0)
 	    {
-	      NSLog(@"GSToUnicode() No iconv for encoding x%02x", enc);
+	      NSLog(@"GSToUnicode() No iconv for encoding x%02"PRIxPTR, enc);
 	      result = NO;
 	      goto done;
 	    }
@@ -2313,7 +2313,7 @@ iconv_start:
 	   */
 	  if (estr == 0)
 	    {
-	      NSLog(@"GSFromUnicode() No iconv for encoding x%02x", enc);
+	      NSLog(@"GSFromUnicode() No iconv for encoding x%02"PRIxPTR, enc);
 	      result = NO;
 	      goto done;
 	    }