diff --git a/ChangeLog b/ChangeLog
index 15d348824..a831d4c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/Additions/GSMime.m: Add a couple more charset mappings.
+
 2006-10-04  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSHTTPURLHandle.m:
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index 73db2f33d..3896cad86 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -3658,6 +3658,12 @@ static NSCharacterSet	*tokenSet = nil;
 	  NSMapInsert(charsets, (void*)@"csisolatin1",
 	    (void*)NSISOLatin1StringEncoding);
 
+	  // A couple of telecoms charsets
+	  NSMapInsert(charsets, (void*)@"ia5",
+	    (void*)NSASCIIStringEncoding);
+	  NSMapInsert(charsets, (void*)@"gsm0338",
+	    (void*)NSGSM0338StringEncoding);
+
 	  NSMapInsert(charsets, (void*)@"iso-8859-2",
 	    (void*)NSISOLatin2StringEncoding);
 	  NSMapInsert(charsets, (void*)@"iso-8859-3",
@@ -3767,6 +3773,8 @@ static NSCharacterSet	*tokenSet = nil;
 	    (void*)@"utf-7");
 	  NSMapInsert(encodings, (void*)NSUTF8StringEncoding,
 	    (void*)@"utf-8");
+	  NSMapInsert(charsets, (void*)NSGSM0338StringEncoding,
+	    (void*)@"gsm0338");
 	}
     }
 }