diff --git a/etc/network.subr b/etc/network.subr
index 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    fi
+
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.conf b/etc/rc.conf
index 1977a47246b7..5c68b85626c8 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.39 1998/02/17 03:05:32 jseger Exp $
+#	$Id: rc.conf,v 1.40 1998/03/07 09:01:59 jkh Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -61,6 +61,8 @@ rpc_lockd_enable="NO"		# Run NFS rpc.lockd (*broken!*) if nfs_server.
 rpc_statd_enable="YES"		# Run NFS rpc.statd if nfs_server (or NO).
 portmap_enable="YES"		# Run the portmapper service (or NO).
 portmap_flags=""		# Flags to portmap (if enabled).
+rarpd_enable="NO"		# Run rarpd (or NO).
+rarpd_flags=""			# Flags to rarpd.
 xtend_enable="NO"		# Run the X-10 power controller daemon.
 xtend_flags=""			# Flags to xtend (if enabled).
 
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    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 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    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 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    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 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    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 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    fi
+
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }
diff --git a/etc/rc.network b/etc/rc.network
index 2879f162b7d8..2fbdf4fa9beb 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.18 1998/02/16 19:21:32 guido Exp $
+#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -145,6 +145,10 @@ network_pass1() {
 	    echo -n ' enabling ARP_PROXY_ALL: '
 	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
     fi
+    if [ "X$rarpd_enable" = X"YES" ]; then
+	    echo -n ' rarpd';     rarpd ${rarpd_flags}
+    fi
+
     echo '.'
     network_pass1_done=YES	# Let future generations know we made it.
 }