diff --git a/SWIG/CHANGES.current b/SWIG/CHANGES.current
index dcbcfe55a..450d8b08f 100644
--- a/SWIG/CHANGES.current
+++ b/SWIG/CHANGES.current
@@ -1,6 +1,10 @@
 Version 1.3.30 (in progress)
 ============================
 
+09/24/2006: olly
+	    Don't accidentally create a "<:" token (which is the same as "[" in C++).
+	    Fixes bug # 1521788.
+
 09/23/2006: olly
 	    [Ruby] Support building with recent versions of the Ruby 1.9
 	    development branch.  Fixes bug #1560092.
diff --git a/SWIG/Source/Swig/stype.c b/SWIG/Source/Swig/stype.c
index be89ec849..5f34fce38 100644
--- a/SWIG/Source/Swig/stype.c
+++ b/SWIG/Source/Swig/stype.c
@@ -508,6 +508,8 @@ SwigType_namestr(const SwigType *t) {
   sz = Len(p);
   for (i = 0; i < sz; i++) {
     String *str = SwigType_str(Getitem(p,i),0);
+    /* Avoid creating a <: token, which is the same as [ in C++. */
+    if (i == 0 && Len(str) && *Char(str) == ':') Putc(' ', r);
     StringAppend(r,str);
     if ((i+1) < sz) Putc(',',r);
     Delete(str);