2 files changed, 18 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 49a29d8..67a487e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+   * Fixed bug with fluxbox-generate_menu -is (thanks Jim Ramsay)
+     util/fluxbox-generate_menu.in
 *07/05/12:
    * Changed interpretation of Horizontal/Vertical maximization of a window that
      is already maximized (Mark)
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 52ded26..c5f0dd5 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1326,22 +1326,22 @@ while [ $# -gt 0 ]; do
         -g) GNOMEMENU=yes; shift;;
         -in) NO_ICON=yes; shift;;
         -is) OTHER_ICONPATHS="
-                /usr/share/icons,
-                /usr/share/icons/mini,
-                /usr/share/pixmaps,
-                /usr/local/share/icons,
-                /usr/local/share/icons/mini,
-                /usr/local/share/pixmaps,
-                /usr/share/xclass/icons,
-                /usr/share/xclass/pixmaps,
-                /usr/local/share/xclass/icons,
-                /usr/local/share/xclass/pixmaps,
-                /usr/X11R6/share/icons/default/16x16,
-                /usr/X11R6/share/icons/kde/16x16,
-                /usr/X11R6/share/icons/hicolor/16x16,
-                /usr/local/X11R6/share/icons/default/16x16,
-                /usr/local/X11R6/share/icons/kde/16x16,
-                /usr/local/X11R6/share/icons/hicolor/16x16,
+                /usr/share/icons
+                /usr/share/icons/mini
+                /usr/share/pixmaps
+                /usr/local/share/icons
+                /usr/local/share/icons/mini
+                /usr/local/share/pixmaps
+                /usr/share/xclass/icons
+                /usr/share/xclass/pixmaps
+                /usr/local/share/xclass/icons
+                /usr/local/share/xclass/pixmaps
+                /usr/X11R6/share/icons/default/16x16
+                /usr/X11R6/share/icons/kde/16x16
+                /usr/X11R6/share/icons/hicolor/16x16
+                /usr/local/X11R6/share/icons/default/16x16
+                /usr/local/X11R6/share/icons/kde/16x16
+                /usr/local/X11R6/share/icons/hicolor/16x16
             "
             shift;;
         -ds) OTHER_DESKTOP_PATHS="