diff --git a/ChangeLog b/ChangeLog
index ea2c834d20..8b6e4fbb30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Angus Leeming  <leeming@lyx.org>
+
+	* configure.ac: remove the HAVE_MKDIR conditional code to
+	src/support/mkdir.C
+
 2004-12-15  Angus Leeming  <leeming-0hXrFu2P2+c@public.gmane.org>
 
 	* configure.ac: add AC_FUNC_MKDIR test and code to
diff --git a/configure.ac b/configure.ac
index 08a2786489..cdb0941a9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,20 +357,6 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if HAVE_MKDIR
-#  if MKDIR_TAKES_ONE_ARG
-     /* MinGW32 */
-#    define mkdir(a, b) mkdir(a)
-#  endif
-#else
-#  if HAVE__MKDIR
-     /* plain Windows 32 */
-#    define mkdir(a, b) _mkdir(a)
-#  else
-#    error "Don't know how to create a directory on this system."
-#  endif
-#endif
-
 #ifdef __EMX__
 #include "support/os2_defines.h"
 #endif
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index d766ceb165..0587d5d462 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Angus Leeming  <leeming@lyx.org>
+
+	* mkdir.C: move the HAVE_MKDIR conditional code out of config.h
+	and into here.
+
 2004-12-15  Angus Leeming  <leeming@lyx.org>
 
 	* FileInfo.[Ch] (getNumberOfLinks): removed.
diff --git a/src/support/mkdir.C b/src/support/mkdir.C
index 21e4b0679c..cab93d0bad 100644
--- a/src/support/mkdir.C
+++ b/src/support/mkdir.C
@@ -20,5 +20,20 @@
 int lyx::support::mkdir(std::string const & pathname, unsigned long int mode)
 {
 	// FIXME: why don't we have mode_t in lyx::mkdir prototype ??
+#if HAVE_MKDIR
+# if MKDIR_TAKES_ONE_ARG
+	// MinGW32
+	return ::mkdir(pathname.c_str());
+# else
+	// POSIX
 	return ::mkdir(pathname.c_str(), mode_t(mode));
+# endif
+#else
+# if HAVE__MKDIR
+	// plain Windows 32
+	return ::_mkdir(pathname.c_str());
+# else
+#  error "Don't know how to create a directory on this system."
+# endif
+#endif
 }