Index: trunk/Ohana/src/kii/setup/SetUpWindow.c
===================================================================
--- trunk/Ohana/src/kii/setup/SetUpWindow.c	(revision 5700)
+++ trunk/Ohana/src/kii/setup/SetUpWindow.c	(revision 5849)
@@ -7,4 +7,5 @@
   int N;
   Icon icon;
+  char *name;
 
   icon.width = icon_width;
@@ -21,9 +22,14 @@
   SetNormalHints (graphic);
   SetWMHints (graphic, &icon);
-  NameWindow (graphic, "Ki'i");
+
+  if (NAME_WINDOW == NULL) {
+    NameWindow (graphic, "Ki'i");
+  } else {
+    ALLOCATE (name, char, strlen(NAME_WINDOW) + 10);
+    sprintf (name, "Ki'i %s", NAME_WINDOW);
+    NameWindow (graphic, name);
+    free (name);
+  }
 
   if (MAP_WINDOW) MapWindow (graphic);
 }
-
-
-