diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 6574a3d56..050f2b47d 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -385,7 +385,7 @@ else
 		mkdir -p ${DESTDIR}${SYSCONFDIR}/network/if-down.d
 	    elif [ $HOST = gentoo ]; then
 		# Gentoo does not support if-{up,down}.d
-		return
+		/bin/true
 	    else
 		mkdir -p ${DESTDIR}/etc/NetworkManager/dispatcher.d
 	    fi
@@ -467,7 +467,7 @@ if [ -z "$DESTDIR" ]; then
 	elif [ $HOST = gentoo ]; then
 	    # On Gentoo, a service must be enabled manually by the user,
 	    # not by the installer
-	    return
+	    /bin/true
 	else
 	    if [ -n "$SYSTEMD" ]; then
 		if systemctl enable shorewall-init.service; then
diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm
index 5c1987544..1d89b88dd 100644
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -810,7 +810,7 @@ CEOF
 		emit "run_ip route replace $gateway src $address dev $physical ${mtu}";
 		emit "run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm";
 	    } else {
-		emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}" if $hostroute;
+		emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}";
 		emit "qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm";
 		emit "run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm";
 	    }
@@ -828,7 +828,7 @@ CEOF
 	emit '';
 	if ( $gateway ) {
 	    if ( $family == F_IPV4 ) {
-		emit qq(run_ip route replace $gateway/32 dev $physical table $id);
+		emit qq(run_ip route replace $gateway/32 dev $physical table $id) if $hostroute;
 		emit qq(run_ip route add default via $gateway src $address dev $physical table $id metric $number);
 	    } else {
 		emit qq(qt \$IP -6 route del default via $gateway src $address dev $physical table $id metric $number);