diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV
--- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV	2008-03-26 17:48:59.000000000 +0100
+++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-{
-    return "" unless (defined $ExternalInterface && defined $GatewayIP);
-
-    my $dev = ($ExternalInterface{Configuration} eq 'disabled') ?
-	$InternalInterface{Name} :
-	$ExternalInterface{Name};
-    return "GATEWAYDEV=$dev";
-}
diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY
--- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY	2005-11-21 05:28:08.000000000 +0100
+++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-{
-    $OUT = "GATEWAY=";
-
-    $OUT .= ($AccessType eq "dedicated" and defined $GatewayIP) ? $GatewayIP 
-                                                                : "";
-}
diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway
--- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway	2016-09-06 21:40:52.325865196 +0200
@@ -0,0 +1,7 @@
+{
+    return "" unless (defined $GatewayIP && (
+                        ($SystemMode eq 'serveronly' && $InternalInterface{Name} eq $THIS_DEVICE ) ||
+                        ($ExternalInterface{Name} eq $THIS_DEVICE) ));
+    $OUT .= "$GatewayIP dev $THIS_DEVICE\n";
+    $OUT .= "default via $GatewayIP dev $THIS_DEVICE\n";
+}
diff -Nur e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.6.0_bs9765/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
--- e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2016-09-06 21:38:23.215953854 +0200
+++ e-smith-base-5.6.0_bs9765/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2016-09-06 21:46:06.424682868 +0200
@@ -1046,7 +1046,7 @@
 	$error = "address matches external interface address";
     }
     elsif (!ipv4_in_network($db->get_value('ExternalIP'),
-	$db->get_value('ExternalNetmask'), "$choice/32"))
+	$db->get_value('ExternalNetmask'), "$choice/32") && $db->get_value('ExternalNetmask') ne '255.255.255.255')
     {
 	$error = "address is not local";
     }