diff --git a/config.lib b/config.lib
index 72ba1ad567..2f07b8736f 100644
--- a/config.lib
+++ b/config.lib
@@ -933,7 +933,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -mwin32"
 		LDFLAGS="$LDFLAGS -mwin32"
 	fi
-	if [ "$os" = "MINGW" ]
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
 	then
 		CFLAGS="$CFLAGS -mno-cygwin"
 		LDFLAGS="$LDFLAGS -mno-cygwin"
@@ -951,7 +951,7 @@ make_cflags_and_ldflags() {
 		LIBS="$LIBS -lrt"
 	fi
 
-	if [ "$os" != "MINGW" ]
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ]
 	then
 		LIBS="$LIBS -lc"
 	fi
diff --git a/src/strgen/strgen.c b/src/strgen/strgen.c
index 1726750f57..640ac3c630 100644
--- a/src/strgen/strgen.c
+++ b/src/strgen/strgen.c
@@ -1271,7 +1271,7 @@ static inline char *mkpath(char *buf, size_t buflen, const char *path, const cha
 	return buf;
 }
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
+#if defined(__MINGW32__)
 /**
  * On MingW, it is common that both / as \ are accepted in the
  * params. To go with those flow, we rewrite all incoming /