diff --git a/Shorewall-core/configure b/Shorewall-core/configure
index eeddc7c1e..cbfc1f90e 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -116,14 +116,14 @@ if [ -z "$vendor" ]; then
     fi
 fi
 
-if [ -z "vendor" ]; then
+if [ -z "$vendor" ]; then
     case `uname` in
 	Darwin)
 	    params[HOST]=apple
 	    rcfile=shorewallrc.apple
 	    ;;
 
-	cygwin*)
+	cygwin*|CYGWIN*)
 	    params[HOST]=cygwin
 	    rcfile=shorewallrc.cygwin
 	    ;;
@@ -154,6 +154,7 @@ if [ -z "vendor" ]; then
 elif [ $vendor = linux ]; then
     rcfile=shorewallrc.default;
 else
+    echo "Vendor is '$vendor'"
     rcfile=shorewallrc.$vendor
     if [ ! -f $rcfile ]; then
 	echo "ERROR: $vendor is not a recognized host type" >&2