diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions
index 12e242975..79850e1e9 100644
--- a/sc2/build/unix/config_functions
+++ b/sc2/build/unix/config_functions
@@ -713,7 +713,7 @@ set_host_system() {
 		esac
 
 		# Use a single capitalization.
-        # What is used is whatever 'uname -s' would give on such a platform.
+		# What is used is whatever 'uname -s' would give on such a platform.
 		UHOST=`$TR "[:lower:]" "[:upper:]" << EOF
 $BUILD_HOST
 EOF
@@ -723,6 +723,7 @@ EOF
 			FREEBSD)       HOST_SYSTEM="FreeBSD" ;;
 			OPENBSD)       HOST_SYSTEM="OpenBSD" ;;
 			MINGW|MINGW32) HOST_SYSTEM="MINGW32" ;;
+			CYGWIN*)       HOST_SYSTEM="CYGWIN" ;;
 			DARWIN)        HOST_SYSTEM="Darwin" ;;
 			SUNOS)         HOST_SYSTEM="SunOS" ;;
 			QNX)           HOST_SYSTEM="QNX" ;;
diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host
index d05fbdeec..3602fb07a 100644
--- a/sc2/build/unix/config_proginfo_host
+++ b/sc2/build/unix/config_proginfo_host
@@ -82,7 +82,7 @@ case "$HOST_SYSTEM" in
 	FreeBSD|OpenBSD)
 		LIB_openal_LDFLAGS="-L/usr/local/lib -pthread -lopenal"
 		;;
-	MINGW32*)
+	MINGW32*|CYGWIN*)
 		LIB_openal_LDFLAGS="-lopenal32"
 		;;
 	Darwin)
@@ -105,7 +105,7 @@ case "$HOST_SYSTEM" in
 		LIB_opengl_CFLAGS="-I/usr/X11R6/include -D_THREAD_SAFE"
 		LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lX11 -lXext -pthread -lGL"
 		;;
-	MINGW32*)
+	MINGW32*|CYGWIN*)
 		LIB_opengl_CFLAGS=""
 		LIB_opengl_LDFLAGS="-lopengl32"
 		;;
@@ -135,7 +135,7 @@ case "$HOST_SYSTEM" in
 		LIB_vorbisfile_CFLAGS="-I/usr/local/include"
 		LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis"
 		;;
-	MINGW32*)
+	MINGW32*|CYGWIN*)
 		LIB_vorbisfile_CFLAGS=""
 		LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -lm -logg"
 		;;
@@ -161,7 +161,7 @@ LIB_vorbisfile_DEPEND_DETECT_BIN="pkgconfig"
 LIB_zlib_NAME="zlib"
 LIB_zlib_CFLAGS=""
 case "$HOST_SYSTEM" in
-	MINGW32*)
+	MINGW32*|CYGWIN*)
 		LIB_zlib_LDFLAGS="-lzdll"
 		;;
 	*)