diff --git a/ChangeLog b/ChangeLog
index 400f171a..061cfde6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes since version 0.64.0:
 .............................
 - fix with gnome hints stuff, related to tasklist/bar
+- ripped off single appicon stuff
+- added better appicon handling of apps of the same type
 
 Changes since version 0.63.1:
 .............................
diff --git a/NEWS b/NEWS
index 524514c2..60c5a1cd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,14 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
---- 0.64.0
+--- 0.65.0
+
+Removed --single-appicon patch and replaced it with a application
+specific collapsing option. Check inspector panel and appicon menu.
+
+
+
+--- 0.63.2
 
 No Polling of Configuration Files
 ---------------------------------
diff --git a/configure.in b/configure.in
index f395b320..86b3abfd 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ AC_INIT(src/WindowMaker.h)
 
 
 
-AM_INIT_AUTOMAKE(WindowMaker, 0.64.0)
+AM_INIT_AUTOMAKE(WindowMaker, 0.65.0)
 
 AM_PROG_LIBTOOL
 
@@ -808,16 +808,6 @@ wprefsdir=$with_appspath/WPrefs.app
 AC_SUBST(wprefsdir)
 
 
-
-dnl Enable single appicon per wm instance+class combo -cls
-dnl =====================================================
-AC_ARG_ENABLE(single-icon,
-[  --enable-single-icon    create one application icon per WM_INSTANCE+WM_CLASS],
-if test "$enableval" = yes; then
-	AC_DEFINE(REDUCE_APPICONS)
-fi
-)
-
 dnl Enable User Defined Menu thing
 dnl ==================================
 AC_ARG_ENABLE(usermenu,
diff --git a/src/application.c b/src/application.c
index 5b3a6649..5ceb56f0 100644
--- a/src/application.c
+++ b/src/application.c
@@ -500,11 +500,11 @@ wApplicationSetCollapse(WApplication *app, Bool flag)
     WApplication *list = app->main_window_desc->screen_ptr->wapp_list;
     int index = 0;
     WWindow *wwin = app->main_window_desc;
-    
+
     if (WFLAGP(app->main_window_desc, collapse_appicons) == flag)
 	return;
-    
-    
+
+
     while (list) {
 	if (strcmp(wwin->wm_instance,
 		   list->main_window_desc->wm_instance) == 0
@@ -515,7 +515,7 @@ wApplicationSetCollapse(WApplication *app, Bool flag)
 
 	list = list->next;
     }
-    
+
     if (app->app_icon && flag)
 	wAppIconMove(app->app_icon, app->app_icon->x_pos, app->app_icon->y_pos);
 }
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 9e703548..d253317e 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -111,7 +111,7 @@
  * (in the root window) for switching to the previous workspace
  * and 5 for the next. This will not work if you enable
  * DisableWSMouseActions or compile wmaker with --enable-lite */
-#undef MOUSE_WS_SWITCH
+#define MOUSE_WS_SWITCH
  
 /*
  * Turn on a hack to make mouse and keyboard actions work even if