diff --git a/ChangeLog b/ChangeLog
index 51a233146..11261c24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-06 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+
+	* Source/Additions/Unicode.m
+	  Headers/Foundation/NSString.h
+	  revert my change from 2013-05-29
+	  breaks decoding of .gorm files in NSString for me on amd64
+
 2013-05-31  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Source/NSLock.m: ([-lockWhenCondition:beforeDate:])
diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h
index 73a3ad038..5097d4e61 100644
--- a/Headers/Foundation/NSString.h
+++ b/Headers/Foundation/NSString.h
@@ -148,7 +148,7 @@ typedef NSUInteger NSStringCompareOptions;
  *  NSGSM0338StringEncoding, NSBIG5StringEncoding,
  *  NSKoreanEUCStringEncoding</code>.</p>
  */
-enum
+typedef enum _NSStringEncoding
 {
 /* 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,8 +204,7 @@ enum
   NSUTF32BigEndianStringEncoding = 0x98000100,
   NSUTF32LittleEndianStringEncoding = 0x9c000100
 #endif
-};
-typedef NSUInteger NSStringEncoding;
+} NSStringEncoding;
 
 enum {
   NSOpenStepUnicodeReservedBase = 0xF400
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index ba30209b5..37eeab83a 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%02"PRIxPTR, enc);
+	      NSLog(@"GSToUnicode() No iconv for encoding x%02x", enc);
 	      result = NO;
 	      goto done;
 	    }
@@ -2313,7 +2313,7 @@ iconv_start:
 	   */
 	  if (estr == 0)
 	    {
-	      NSLog(@"GSFromUnicode() No iconv for encoding x%02"PRIxPTR, enc);
+	      NSLog(@"GSFromUnicode() No iconv for encoding x%02x", enc);
 	      result = NO;
 	      goto done;
 	    }