diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 12a520135..a39a3e7f5 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -174,8 +174,6 @@ done
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 
-[ -n "$BUILD" ] || BUILD=$HOST
-
 if [ -z "$BUILD" ]; then
     case $(uname) in
 	cygwin*)
@@ -186,13 +184,13 @@ if [ -z "$BUILD" ]; 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)
 			BUILD=redhat
 			;;
-		    debian)
+		    debian|ubuntu)
 			BUILD=debian
 			;;
 		    opensuse)
@@ -204,6 +202,8 @@ if [ -z "$BUILD" ]; then
 		esac
 	    elif [ -f /etc/debian_version ]; then
 		BUILD=debian
+	    elif [ -f /etc/ubuntu_version ]; then
+		BUILD=debian
 	    elif [ -f /etc/gentoo-release ]; then
 		BUILD=gentoo
 	    elif [ -f /etc/redhat-release ]; then