diff --git a/etc/network.subr b/etc/network.subr
index 9714eb763193..d44043edcfa3 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.conf b/etc/rc.conf
index 1f7e0c8c3874..c64fb79e9cb9 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.7 1997/05/05 07:08:31 jkh Exp $
+#	$Id: rc.conf,v 1.8 1997/05/05 09:32:34 jkh Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -86,6 +86,7 @@ mrouted_enable="NO"		# Do multicast routing (see /etc/mrouted.conf)
 ipxgateway_enable="NO"		# Set to YES to enable IPX routing.
 ipxrouted_enable="NO"		# Set to YES to run the IPX routing daemon.
 ipxrouted_flags=""		# Flags for IPX routing daemon.
+arpproxy_all=""			# replaces obsolete kernel option ARP_PROXY_ALL
 
 
 ##############################################################
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.network b/etc/rc.network
index 9714eb763193..d44043edcfa3 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.1.2.6 1997/05/01 23:42:19 jkh Exp $
+#	$Id: rc.network,v 1.6 1997/05/03 11:22:17 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -93,6 +93,11 @@ network_pass1() {
 	    echo -n ' IPXrouted: '
 	    IPXrouted ${ipxrouted_flags} > /dev/null 2>&1
     fi
+    
+    if [ "X$arpproxy_all" = X"YES" ]; then
+	    echo -n ' enabling ARP_PROXY_ALL: '
+	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
+    fi
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }