diff --git a/misc/unictabl/mk_ctable.c b/misc/unictabl/mk_ctable.c
index 65c96f87bb..19b63326cc 100644
--- a/misc/unictabl/mk_ctable.c
+++ b/misc/unictabl/mk_ctable.c
@@ -40,8 +40,8 @@ int main(int argc, char *argv[])
     /* dump it: */
     
     printf("\n\n"
-           "/* \n"
-           " * %s to Unicode recoding table \n"
+           "/*\n"
+           " * %s to Unicode recoding table\n"
            " * based on file %s by Unicode Consortium\n"
            " */\n\n"
            "static wxUint16 encoding_table__%s[128] = {",
@@ -50,10 +50,10 @@ int main(int argc, char *argv[])
     for (i = 128; i < 256; i++)
     { 
         if (i % 8 == 0)
-            printf("\n    ");
-        printf("0x%04X%c ", table[i].u, (i == 255) ? '\n' : ',');
+            printf("\n   ");
+        printf(" 0x%04X%c", table[i].u, (i == 255) ? '\n' : ',');
     }
-    printf("};\n");
+    printf(" };\n");
 
     qsort(table + 128, 128, sizeof(table[0]), cmpt);
 
diff --git a/misc/unictabl/mk_encodings.sh b/misc/unictabl/mk_encodings.sh
index f97abc6687..a7dc61a7ac 100755
--- a/misc/unictabl/mk_encodings.sh
+++ b/misc/unictabl/mk_encodings.sh
@@ -11,36 +11,36 @@ echo "  * writing copyright info..."
 echo "
 
 /*
- *	This file is #included by encconv.cpp
+ *  This file is #included by encconv.cpp
  *
- *	CVS-ID: \$Id\$
+ *  CVS-ID: \$Id\$
  *
- *	*** ***  CAUTION! *** ***
- *	Do not modify this file by hand! It is generated by shell
- *	script \$(WXWIN)/misc/unictabl/regenerate
+ *  *** ***  CAUTION! *** ***
+ *  Do not modify this file by hand! It is generated by shell
+ *  script \$(WXWIN)/misc/unictabl/regenerate
  *
- *	Parts of this file are based on tables published by Unicode, Inc.
- *	Original tables are freely available at 
- *	    ftp://ftp.unicode.org/MAPPINGS
+ *  Parts of this file are based on tables published by Unicode, Inc.
+ *  Original tables are freely available at
+ *      ftp://ftp.unicode.org/Public/MAPPINGS
  *
- *	Original copyright info as present in mapping tables follows:
+ *  Original copyright info as present in mapping tables follows:
  *
  *
- *	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+ *  Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
  *
- *	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
- *	No claims are made as to fitness for any particular purpose.  No
- *	warranties of any kind are expressed or implied.  The recipient
- *	agrees to determine applicability of information provided.  If this
- *	file has been provided on optical media by Unicode, Inc., the sole
- *	remedy for any claim will be exchange of defective media within 90
- *	days of receipt.
+ *  This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+ *  No claims are made as to fitness for any particular purpose.  No
+ *  warranties of any kind are expressed or implied.  The recipient
+ *  agrees to determine applicability of information provided.  If this
+ *  file has been provided on optical media by Unicode, Inc., the sole
+ *  remedy for any claim will be exchange of defective media within 90
+ *  days of receipt.
  *
- *	Unicode, Inc. hereby grants the right to freely use the information
- *	supplied in this file in the creation of products supporting the
- *	Unicode Standard, and to make copies of this file in any form for
- *	internal or external distribution as long as this notice remains
- *	attached.
+ *  Unicode, Inc. hereby grants the right to freely use the information
+ *  supplied in this file in the creation of products supporting the
+ *  Unicode Standard, and to make copies of this file in any form for
+ *  internal or external distribution as long as this notice remains
+ *  attached.
  */
 
 " > unictabl.inc