diff --git a/ChangeLog b/ChangeLog
index da015996df..80f901d9cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-18   Christian Stimming <stimming@tuhh.de>
+
+	* src/gnc-module/gnc-module.c: On windows, deactivate gnucash's
+	extra de-quoting of path names that is done on the GNC_MODULE_PATH
+	env variable.
+
 2006-07-16  Derek Atkins  <derek@ihtfp.com>
 
 	* configure.in:
diff --git a/src/gnc-module/gnc-module.c b/src/gnc-module/gnc-module.c
index 76187b38b9..0c0eba9faf 100644
--- a/src/gnc-module/gnc-module.c
+++ b/src/gnc-module/gnc-module.c
@@ -67,6 +67,13 @@ gnc_module_system_search_dirs(void)
   {
     switch(*cpos) 
     {
+#ifndef G_OS_WIN32
+    /* On windows, with '\' as the directory separator character,
+       this additional de-quoting will make every path processing
+       fail miserably. Anyway this should probably be thrown out
+       altogether, because this additional level of de-quoting
+       (after shell quoting) is completely unexpected and
+       uncommon. */
     case '\\':
       if(!escchar) 
       {
@@ -78,6 +85,7 @@ gnc_module_system_search_dirs(void)
         escchar = FALSE;
       }
       break;
+#endif
       
     case ':':
       if(!escchar)