diff --git a/ChangeLog b/ChangeLog
index 0e16643891..53f3ce02d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-17  Sven Neumann  <sven@gimp.org>
+
+	* app/base/base.c (base_init)
+	* app/base/tile-swap.c (tile_swap_init): create temp and swap
+	directories using g_mkdir_with_parents() (bug #308658).
+
 2005-10-17  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimpdrawable-foreground-extract.[ch]
diff --git a/app/base/base.c b/app/base/base.c
index f53ab9fe64..0db23bb5bf 100644
--- a/app/base/base.c
+++ b/app/base/base.c
@@ -100,10 +100,10 @@ base_init (GimpBaseConfig *config,
   temp_dir = gimp_config_path_expand (config->temp_path, TRUE, NULL);
 
   if (! g_file_test (temp_dir, G_FILE_TEST_EXISTS))
-    g_mkdir (temp_dir,
-             S_IRUSR | S_IXUSR | S_IWUSR |
-             S_IRGRP | S_IXGRP |
-             S_IROTH | S_IXOTH);
+    g_mkdir_with_parents (temp_dir,
+                          S_IRUSR | S_IXUSR | S_IWUSR |
+                          S_IRGRP | S_IXGRP |
+                          S_IROTH | S_IXOTH);
 
   g_free (temp_dir);
 
diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c
index a0038511b8..2435f0b6ba 100644
--- a/app/base/tile-swap.c
+++ b/app/base/tile-swap.c
@@ -231,10 +231,10 @@ tile_swap_init (const gchar *path)
 
   /*  create the swap directory if it doesn't exist */
   if (! g_file_test (swapdir, G_FILE_TEST_EXISTS))
-    g_mkdir (swapdir,
-             S_IRUSR | S_IXUSR | S_IWUSR |
-             S_IRGRP | S_IXGRP |
-             S_IROTH | S_IXOTH);
+    g_mkdir_with_parents (swapdir,
+                          S_IRUSR | S_IXUSR | S_IWUSR |
+                          S_IRGRP | S_IXGRP |
+                          S_IROTH | S_IXOTH);
 
   g_free (swapdir);