diff --git a/Shorewall-core/configure b/Shorewall-core/configure
index c77f3e6fc..9c6ae87d2 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -95,13 +95,13 @@ vendor=${params[HOST]}
 
 if [ -z "$vendor" ]; then
     if [ -f /etc/os-release ]; then
-	eval $(cat /etc/os-release | grep ^ID)
+	eval $(cat /etc/os-release | grep ^ID=)
 
 	case $ID in
 	    fedora)
 		vendor=redhat
 		;;
-	    debian)
+	    debian|ubuntu)
 		vendor=debian
 		;;
 	    opensuse)