diff --git a/common/ChangeLog b/common/ChangeLog
index 5b4f1074c..92f23c28f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-17  Marcus Brinkmann  <mb@g10code.com>
+
+	* homedir.c (gnupg_cachedir): Create /temp subdirectories.
+
 2010-12-02  Werner Koch  <wk@g10code.com>
 
 	* miscellaneous.c (gnupg_cipher_algo_name): New.  Replace all
diff --git a/common/homedir.c b/common/homedir.c
index 69a18d76d..a6364f8b5 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -412,6 +412,8 @@ gnupg_cachedir (void)
           dir = "c:\\temp\\cache\\gnupg";
 #ifdef HAVE_W32CE_SYSTEM
           dir += 2;
+	  w32_try_mkdir ("\\temp\\cache");
+	  w32_try_mkdir ("\\temp\\cache\\gnupg");
 #endif
         }
     }