diff --git a/ChangeLog b/ChangeLog
index 251f0e36..68ac3e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/main.c:
+   Don't check for old configuration directory location on Windows.
+
+
 2009-02-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/geanymenubuttonaction.c, src/geanyentryaction.c,
diff --git a/src/main.c b/src/main.c
index 76ed258d..cae60f91 100644
--- a/src/main.c
+++ b/src/main.c
@@ -592,6 +592,7 @@ static gint create_config_dir(void)
 
 	if (! g_file_test(app->configdir, G_FILE_TEST_EXISTS))
 	{
+#ifndef G_OS_WIN32
 		/* if we are *not* using an alternate config directory, we check whether the old one
 		 * in ~/.geany still exists and try to move it */
 		if (alternate_config == NULL)
@@ -626,6 +627,7 @@ static gint create_config_dir(void)
 			}
 			g_free(old_dir);
 		}
+#endif
 		geany_debug("creating config directory %s", app->configdir);
 		saved_errno = utils_mkdir(app->configdir, FALSE);
 	}