diff --git a/userspace/rootfs_override/etc/ifplugd/ifplugd.action b/userspace/rootfs_override/etc/ifplugd/ifplugd.action
index 691d3e5a49d6f1feb095f03106f9c7c23bcbc1ff..750692387b191bce363d129d85068ef19a2738bb 100755
--- a/userspace/rootfs_override/etc/ifplugd/ifplugd.action
+++ b/userspace/rootfs_override/etc/ifplugd/ifplugd.action
@@ -19,6 +19,7 @@
 
 set -e
 
+## NOTE: wr-switch-sw doesn't run ifplugd by default any more
 if [ -z "$1" ] || [ -z "$2" ] ; then
 	echo "Wrong arguments" > /dev/stderr
 	exit 1
diff --git a/userspace/rootfs_override/etc/init.d/S40network b/userspace/rootfs_override/etc/init.d/S40network
index a59d094b2eeb4f59a98b20bae0ebdc5f518aba8f..2d14a3abd5e37ed5447aafeadae0b7267adf5e23 100755
--- a/userspace/rootfs_override/etc/init.d/S40network
+++ b/userspace/rootfs_override/etc/init.d/S40network
@@ -3,17 +3,15 @@
 # Start the network....
 #
 
-#MAC=`/wr/bin/get_board_mac`
-#echo "Management port MAC address: $MAC"
-#ifconfig eth0 hw ether $MAC
-#ifplugd -i eth0
-#udhcpc -n
-
 if grep -q '/ nfs' /proc/mounts; then
-	echo "Running via NFS, no ifplugd."
+	echo "Running via NFS: leaving eth0 config alone"
+	exit 0
+fi
+
+if grep -v '#' /etc/network/interfaces | grep -q 'eth0.*dhcp'; then
+    # run dhcp client in background, as ifup would run in one-shot mode
+    udhcpc -b -i eth0
 else
-	echo "Starting ifplugd..."
-	/usr/sbin/ifplugd -I -f -i eth0
-	#Pull up the interface (check static/dynamic config in /etc/network/interfaces)
-	ifup eth0
+    # ifup to use static parameters from /etc/netwrok/interfaces
+    ifup eth0
 fi