diff --git a/ChangeLog b/ChangeLog
index bb0534dd..0e094e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-01 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* user_home.c: Port to MINGW
+
 2002-02-28  Adam Fedor  <fedor@gnu.org>
 
 	* target.make (darwin5): Correct compile flags. Add
diff --git a/user_home.c b/user_home.c
index d533c018..30f32996 100644
--- a/user_home.c
+++ b/user_home.c
@@ -19,8 +19,21 @@
 
 #include "config.h"
 
+#ifdef __MINGW32__
+#ifndef __MINGW__
+#define __MINGW__
+#endif
+#ifndef __WIN32__
+#define __WIN32__
+#endif
+#endif
+
 #include <stdio.h>
 
+#if defined(__MINGW__)
+# include <windows.h>
+#endif
+
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -56,7 +69,7 @@ int main (int argc, char** argv)
 #else
   struct passwd *pw;
 #endif
-  const char *loginName = 0;
+  char		*loginName = 0;
 
   if (loginName == 0)
     {