diff --git a/configure.ac b/configure.ac
index 2fe1fab..6540e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ dnl ---------------------------------------------------------------------------
 DLLPREFIX="lib"
 
 case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 		app_cv_osname="windows"
 		CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
 		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
@@ -201,7 +201,7 @@ AC_CHECK_HEADER(libintl.h, [
 	AC_DEFINE(HAVE_LIBINTL, 1)
 
 	case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 		INTL_LIBS="-lintl"
 		;;
 
@@ -380,11 +380,11 @@ if test "$app_cv_enable_crl_check" == "yes"; then
 	AC_DEFINE(SSL_ENABLE_CRL_CHECK)
 fi
 
-AC_ARG_WITH([default-crl-url], 
-	[AS_HELP_STRING([--with-default-crl-url], [Set lib3270 default crl url])], 
-[ 
-	AC_DEFINE_UNQUOTED(SSL_DEFAULT_CRL_URL,"$withval") 
-],[ 
+AC_ARG_WITH([default-crl-url],
+	[AS_HELP_STRING([--with-default-crl-url], [Set lib3270 default crl url])],
+[
+	AC_DEFINE_UNQUOTED(SSL_DEFAULT_CRL_URL,"$withval")
+],[
 	AC_MSG_NOTICE(No default crl url)
 ])
 
@@ -447,7 +447,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n
 if test "$app_cv_inet_ntop" == "auto"; then
 
 	case "$host" in
-	*-mingw32)
+	*-mingw32|*-pc-msys)
 		app_cv_inet_ntop="yes"
 		;;
 
diff --git a/lib3270.cbp b/lib3270.cbp
index 508d1fe..af465ad 100644
--- a/lib3270.cbp
+++ b/lib3270.cbp
@@ -39,6 +39,7 @@
 		<Unit filename="LICENCA" />
 		<Unit filename="LICENSE" />
 		<Unit filename="README.md" />
+		<Unit filename="configure.ac" />
 		<Unit filename="gitsync.sh" />
 		<Unit filename="src/include/3270ds.h" />
 		<Unit filename="src/include/actionsc.h" />
@@ -111,7 +112,9 @@
 		<Unit filename="src/lib3270++/private.h" />
 		<Unit filename="src/lib3270++/session.cc" />
 		<Unit filename="src/lib3270++/testprogram/testprogram.cc" />
-		<Unit filename="src/lib3270++/windows/resources.rc" />
+		<Unit filename="src/lib3270++/windows/resources.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Unit filename="src/lib3270/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -254,7 +257,9 @@
 		<Unit filename="src/lib3270/windows/event_dispatcher.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/windows/resources.rc" />
+		<Unit filename="src/lib3270/windows/resources.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Unit filename="src/lib3270/windows/resources.rc.in" />
 		<Unit filename="src/lib3270/windows/util.c">
 			<Option compilerVar="CC" />
--
libgit2 0.21.2