--- config.hin.ori	2009-02-01 17:41:02.000000000 -0800
+++ config.hin	2009-02-03 20:03:12.000000000 -0800
@@ -141,6 +141,7 @@
 #undef HAVE_SYS_IOCTL_H		/* have <sys/ioctl.h> */
 #undef HAVE_SYS_NDIR_H		/* AC_HEADER_DIRENT */
 #undef HAVE_SYS_PARAM_H		/* AM_GNU_GETTEXT */
+#undef HAVE_SYS_TIME_H		/* have <sys/time.h> */
 #undef HAVE_SYS_TIMEB_H		/* have <sys/timeb.h> */
 #undef HAVE_SYS_WAIT_H		/* have <sys/wait.h> */
 #undef HAVE_TERMIOS_H		/* have <termios.h> */
@@ -237,6 +238,7 @@
 #undef TELNET_PATH		/* CF_PATH_PROG(telnet) */
 #undef TERMIO_AND_CURSES	/* CF_TERMIO_AND_CURSES workaround */
 #undef TERMIO_AND_TERMIOS	/* CF_TERMIO_AND_TERMIOS workaround */
+#undef TIME_WITH_SYS_TIME	/* AC_HEADER_TIME */
 #undef TN3270_PATH		/* CF_PATH_PROG(tn3270) */
 #undef TOUCH_PATH		/* CF_PATH_PROG(touch) */
 #undef ULTRIX			/* config.sub */
--- configure.in.ori	2009-02-01 17:41:02.000000000 -0800
+++ configure.in	2009-02-04 08:05:44.000000000 -0800
@@ -93,6 +93,14 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LN_S
+case $host_os in
+mingw*)
+LN_S="cp -p"
+AC_MSG_RESULT(Override: No symbolic links in mingw.)
+	;;
+*)
+	;;
+esac
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_YACC
@@ -338,6 +346,12 @@
 	;;
 esac
 
+case $host_os in
+mingw*)
+	EXTRA_OBJS="$EXTRA_OBJS LYIcon\$o"
+	;;
+esac
+
 CF_ANSI_CC_REQD
 
 dnl --------------------------------------------------------------------------
--- src/LYCurses.c.ori	2009-02-01 17:41:02.000000000 -0800
+++ src/LYCurses.c	2009-02-04 20:59:34.000000000 -0800
@@ -8,6 +8,10 @@
 #endif /* UNIX */
 #endif /* __MINGW32__ */
 
+#ifdef __DJGPP__
+#include <pc.h>
+#endif /* __DJGPP__ */
+
 #include <LYCurses.h>
 #include <LYStyle.h>
 #include <LYUtils.h>
@@ -1461,20 +1465,16 @@
 #endif /* __DJGPP__ */
 
 #if defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC))
-#if defined(PDCURSES)
-    endwin();
-#else /* !PDCURSES */
 #ifdef __DJGPP__
     ScreenClear();
-#else /* some flavor of win32?  */
-#ifdef __MINGW32__
-    clear();
-#else
-    clrscr();
-#endif
-#endif /* win32 */
+#if defined(PDCURSES)
+    endwin();
 #endif /* PDCURSES */
-#else
+#else /* not DJGPP or MINGW32 */
+    clrscr();
+#if defined(PDCURSES)
+    endwin();
+#endif  /* PDCURSES */
 
     if (LYCursesON == TRUE) {
 	lynx_nl2crlf(TRUE);
@@ -1493,10 +1493,22 @@
 #endif
     }
 
+#endif /* __DJGPP__ */
     fflush(stdout);
 #endif /* defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC)) */
     fflush(stderr);
 
+#ifdef __MINGW32__
+    chtype bb;
+    bb=getbkgd(stdscr);
+    bkgdset(0);
+    clear();
+    refresh();
+    bkgdset(bb);
+#if defined(PDCURSES)
+    endwin();
+#endif  /* PDCURSES */
+#endif /* __MINGW32__ */
     LYCursesON = FALSE;
     CTRACE((tfp, "stop_curses: done.\n"));
 
--- src/LYIcon.rc.ori	2009-01-02 07:01:10.000000000 -0800
+++ src/LYIcon.rc	2009-01-02 07:01:10.000000000 -0800
@@ -0,0 +1 @@
+100	ICON	"./lynx.ico"
--- src/LYMain.c.ori	2009-02-03 22:52:50.000000000 -0800
+++ src/LYMain.c	2009-02-03 22:56:24.000000000 -0800
@@ -57,7 +57,7 @@
 #include <io.h>
 #endif
 
-#ifdef LOCALE
+#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
 #undef gettext			/* Solaris locale.h prototypes gettext() */
 #include <locale.h>
 #ifndef HAVE_GETTEXT
--- src/makefile.in.ori	2008-12-31 17:22:26.000000000 -0800
+++ src/makefile.in	2009-01-02 07:01:12.000000000 -0800
@@ -149,6 +149,9 @@
 LYmktime$o :		$(top_srcdir)/userdefs.h
 LYrcFile$o :		$(top_srcdir)/userdefs.h
 
+LYIcon$o:
+	windres -i LYIcon.rc -o LYIcon$o -O coff
+
 CHRTR= chrtrans/
 
 TABLES= \
--- www/Library/Implementation/www_tcp.h.ori	2008-12-31 17:22:26.000000000 -0800
+++ www/Library/Implementation/www_tcp.h	2009-02-03 00:21:12.000000000 -0800
@@ -632,6 +632,9 @@
 #ifdef word
 #undef word
 #endif /* word */
+#ifdef set_timeout
+#undef set_timeout
+#endif /* set_timeout */
 #define select select_s
 
 #undef NETWRITE