diff --git a/ChangeLog b/ChangeLog
index a583ed280..1a5aaf86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-04 Georg Fleischmann <G.Fleischmann@vhf.de>
+
+	* Source/Additions/unicode/nextstep.h: Fixups for encoding mapping.
+
 2009-06-02  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSUndoManager.m (-undo, -redo): Call -_begin instead of
diff --git a/Source/Additions/unicode/nextstep.h b/Source/Additions/unicode/nextstep.h
index 95c881a9f..356155923 100644
--- a/Source/Additions/unicode/nextstep.h
+++ b/Source/Additions/unicode/nextstep.h
@@ -51,8 +51,11 @@ static unichar Next_char_to_uni_table[] =
   0x0192,
   0x00A7,
   0x00A4,
+  0xFBA9,
   0x201C,
   0x00AB,
+  0xFBAC,
+  0xFBAD,
   0xFB01,
   0xFB02,
   0x00AE,
@@ -63,6 +66,8 @@ static unichar Next_char_to_uni_table[] =
   0x00A6,
   0x00B6,
   0x2022,
+  0xFBB8,
+  0xFBB9,
   0x201D,
   0x00BB,
   0x2026,