diff --git a/ChangeLog b/ChangeLog
index 5e9984319f..05d816453e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkicontheme.c (insert_theme): Properly clean up
+	if an icon theme index file has no directories.  (#381236)
+
 2006-12-02  Dom Lachowicz <domlachowicz@gmail.com>
 
 	* src/modules/engines/ms-windows/msw_style.c: Bug 351678 - Notebooks 
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 0baef66250..11b53e9369 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -952,6 +952,8 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name)
   if (!dirs)
     {
       g_warning ("Theme file for %s has no directories\n", theme_name);
+      priv->themes = g_list_remove (priv->themes, theme);
+      g_free (theme->name);
       g_free (theme->display_name);
       g_free (theme);
       g_key_file_free (theme_file);