diff --git a/ChangeLog b/ChangeLog
index 7b3e87ff45..f4b338ebc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
+	only on Unix.
+
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b3e87ff45..f4b338ebc2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
+	only on Unix.
+
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7b3e87ff45..f4b338ebc2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
+	only on Unix.
+
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b3e87ff45..f4b338ebc2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
+	only on Unix.
+
 2004-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 09336f6678..86704f45d3 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -567,7 +567,10 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
   xdg_data_dirs = g_get_system_data_dirs ();
   for (i = 0; xdg_data_dirs[i]; i++) ;
 
-  priv->search_path_len = i + 3;
+  priv->search_path_len = i + 2;
+#ifdef G_OS_UNIX
+  priv->search_path_len++;
+#endif
   
   priv->search_path = g_new (char *, priv->search_path_len);
   
@@ -578,7 +581,9 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
   for (j = 0; xdg_data_dirs[j]; j++) 
     priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
 
+#ifdef G_OS_UNIX
   priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
+#endif
 
   priv->themes_valid = FALSE;
   priv->themes = NULL;