diff --git a/acconfig.h b/acconfig.h
index 63dc777c4..bd149da7d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -145,5 +145,12 @@
 #undef SND_RENDER_LIST
 #undef SND_RENDER_PROTOS
 
+#if defined (WIN32) && !defined(_WIN32)
+# define _WIN32
+#endif
+#if defined (_WIN32) && !defined(WIN32)
+# define WIN32
+#endif
+
 @BOTTOM@
 #endif // __config_h_
diff --git a/configure.ac b/configure.ac
index 3d1e1af4d..6121019d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ case "$host_os" in
 		if test "$host" != "$build"; then
 			case "$build_os" in
 				cygwin*)
-					CFLAGS="$CFLAGS -mno-cygwin"
+					CFLAGS="$CFLAGS -mno-cygwin -mconsole"
 					CPPFLAGS="$CPPFLAGS $CFLAGS"
 					;;
 				*)
@@ -563,6 +563,17 @@ if test "x$enable_sdl" != xno; then
 		HAVE_SDL=yes,
 		HAVE_SDL=no)
 	AC_SUBST(HAVE_SDL)
+	if test "x$HAVE_SDL" = "xyes"; then
+		case "$host_os" in
+			mingw*)
+				case "$build_os" in
+					cygwin*)
+						SDL_LIBS=`echo $SDL_LIBS | sed -e 's/-mwindows//'`
+						;;
+				esac
+			;;
+		esac
+	fi
 fi
 
 dnl XMMS Checks