diff --git a/ChangeLog b/ChangeLog
index da5acba50..134db2b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-29  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Additions/GNUstepBase/unicode/gsm0338.h: Map unicode
+	no-break-space character to gsm space rather than to gsm escape
+	character.
+
 2005-09-28  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSMime.m: (-convertToBinary, -convertToBase64)
diff --git a/Headers/Additions/GNUstepBase/unicode/gsm0338.h b/Headers/Additions/GNUstepBase/unicode/gsm0338.h
index 1f489cd28..d9c164772 100644
--- a/Headers/Additions/GNUstepBase/unicode/gsm0338.h
+++ b/Headers/Additions/GNUstepBase/unicode/gsm0338.h
@@ -234,7 +234,7 @@ _ucc_ GSM0338_uni_to_char_table[] =
   {0x0078,0x78,},
   {0x0079,0x79,},
   {0x007A,0x7A,},
-  {0x00A0,0x1B,},
+  {0x00A0,0x20,},	/* Map unicode no-break-space to gsm space */
   {0x00A1,0x40,},
   {0x00A3,0x01,},
   {0x00A4,0x24,},