diff --git a/etc/network.subr b/etc/network.subr
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
diff --git a/etc/rc.network b/etc/rc.network
index 58cbc78e0685..0a40acc52a6e 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.45 1999/06/05 05:45:47 phk Exp $
+#	$Id: rc.network,v 1.46 1999/06/05 12:06:19 bde Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -315,7 +315,12 @@ network_pass3() {
 	    if [ "X${amd_map_program}" != X"NO" ]; then
 		amd_flags="${amd_flags} `eval ${amd_map_program}`"
 	    fi
-	    amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    if [ -n "$amd_flags" ]
+	    then
+	      amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
+	    else
+	      amd 2> /dev/null
+	    fi
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then