diff --git a/ChangeLog b/ChangeLog
index c071829e2d..151d7608f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-22  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimp-tools.c (gimp_tools_init): added a call to
+	gimp_tool_options_create_folder().
+
+	* app/core/gimp-user-install.c (gimp_user_install_items): no need
+	to create the tool-options folder here if we are doing that on
+	each startup.
+
 2008-05-22  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpcurvestool.c (gimp_curves_tool_dialog): use a
diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c
index 6680198e43..00cc5a1eee 100644
--- a/app/core/gimp-user-install.c
+++ b/app/core/gimp-user-install.c
@@ -94,7 +94,6 @@ gimp_user_install_items[] =
   { "templates",       USER_INSTALL_MKDIR },
   { "themes",          USER_INSTALL_MKDIR },
   { "tmp",             USER_INSTALL_MKDIR },
-  { "tool-options",    USER_INSTALL_MKDIR },
   { "curves",          USER_INSTALL_MKDIR },
   { "levels",          USER_INSTALL_MKDIR },
   { "fractalexplorer", USER_INSTALL_MKDIR },
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index 60dddf708d..50fa2cd3e8 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -184,6 +184,8 @@ gimp_tools_init (Gimp *gimp)
 
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
+  gimp_tool_options_create_folder ();
+
   tool_manager_init (gimp);
 
   gimp_container_freeze (gimp->tool_info_list);