diff -urw WindowMaker-CVS/src/appicon.c WindowMaker-mhaque/src/appicon.c
--- WindowMaker-CVS/src/appicon.c	Wed May 23 22:42:37 2001
+++ WindowMaker-mhaque/src/appicon.c	Thu May 24 00:10:38 2001
@@ -449,9 +449,11 @@
     }
 #endif /* HIDDENDOT */
 
+#ifdef WINDOW_INDEX
     if (wapp)
 	index = wApplicationIndexOfGroup(wapp);
     else
+#endif /* WINDOW_INDEX */
 	index = 0;
     
     if (index > 0) {
diff -urw WindowMaker-CVS/src/application.c WindowMaker-mhaque/src/application.c
--- WindowMaker-CVS/src/application.c	Sun May 13 00:01:21 2001
+++ WindowMaker-mhaque/src/application.c	Wed May 23 23:55:12 2001
@@ -544,6 +544,7 @@
 
 
 
+#ifdef WINDOW_INDEX
 /*
  * Returns index number of the app in case there are more than
  * one instance of the same class/name.
@@ -577,4 +578,4 @@
     
     return 0;
 }
-
+#endif /* WINDOW_INDEX */
diff -urw WindowMaker-CVS/src/application.h WindowMaker-mhaque/src/application.h
--- WindowMaker-CVS/src/application.h	Sat Feb 10 23:29:30 2001
+++ WindowMaker-mhaque/src/application.h	Thu May 24 00:09:30 2001
@@ -58,7 +58,9 @@
 void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance, 
 				    char *wm_class);
 
+#ifdef WINDOW_INDEX
 int wApplicationIndexOfGroup(WApplication *app);
+#endif /* WINDOW_INDEX */
 
 void wApplicationSetCollapse(WApplication *app, Bool flag);
 
diff -urw WindowMaker-CVS/src/wconfig.h.in WindowMaker-mhaque/src/wconfig.h.in
--- WindowMaker-CVS/src/wconfig.h.in	Sat Mar 17 16:58:01 2001
+++ WindowMaker-mhaque/src/wconfig.h.in	Wed May 23 23:41:57 2001
@@ -207,6 +207,12 @@
 #undef WINDOW_BIRTH_ZOOM
 
 /*
+ * #undef if you dont want the window title to have the index number of
+ * the app in case there are more than one instance of the same class/name.
+ */
+#undef WINDOW_INDEX
+
+/*
  * whether arrow drawing in clip buttons should be gradiented
  */
 #undef GRADIENT_CLIP_ARROWS
diff -urw WindowMaker-CVS/src/window.c WindowMaker-mhaque/src/window.c
--- WindowMaker-CVS/src/window.c	Tue May 15 21:25:41 2001
+++ WindowMaker-mhaque/src/window.c	Thu May 24 00:11:40 2001
@@ -1773,8 +1773,10 @@
     if (!wwin->frame)
 	return;
     
+#ifdef WINDOW_INDEX
     if (app) 
 	instIndex = wApplicationIndexOfGroup(app);
+#endif /* WINDOW_INDEX */
     
     
     wwin->flags.wm_name_changed = 1;