diff --git a/config/network/interfaces.default b/config/network/interfaces.default
index 92a36e9b89..017fabedaf 100644
--- a/config/network/interfaces.default
+++ b/config/network/interfaces.default
@@ -1,5 +1,6 @@
 # Wired adapter #1
 allow-hotplug eth0
+#no-auto-down eth0
 iface eth0 inet dhcp
 #	hwaddress ether # if you want to set MAC manually
 #	pre-up /sbin/ifconfig eth0 mtu 3838 # setting MTU for DHCP, static just: mtu 3838
diff --git a/distributions.sh b/distributions.sh
index 399d2fad61..5f33513c5d 100644
--- a/distributions.sh
+++ b/distributions.sh
@@ -153,8 +153,9 @@ xenial)
 
 		# disable stopping network interfaces
 		# fixes shutdown with root on NFS
-		mkdir -p $CACHEDIR/sdcard/etc/systemd/system/networking.service.d/
-		printf "[Service]\nExecStop=\n" > $CACHEDIR/sdcard/etc/systemd/system/networking.service.d/10-nostop.conf
+		# NOTE: fixed by "no-auto-down eth0" in interfaces.default
+		#mkdir -p $CACHEDIR/sdcard/etc/systemd/system/networking.service.d/
+		#printf "[Service]\nExecStop=\n" > $CACHEDIR/sdcard/etc/systemd/system/networking.service.d/10-nostop.conf
 		;;
 	*)
 	exit_with_error "Unknown OS release selected"
diff --git a/makeboarddeb.sh b/makeboarddeb.sh
index 7f15228160..07cf96a606 100644
--- a/makeboarddeb.sh
+++ b/makeboarddeb.sh
@@ -134,6 +134,7 @@ create_board_package()
 	mkdir -p $destination/etc/network/
 	cp $SRC/lib/config/network/interfaces.* $destination/etc/network/
 	[[ $RELEASE = wheezy ]] && sed -i 's/allow-hotplug/auto/g' $destination/etc/network/interfaces.default
+	[[ $RELEASE = xenial ]] && sed -i 's/#no-auto-down/no-auto-down/g' $destination/etc/network/interfaces.default
 
 	# apt configuration
 	mkdir -p $destination/etc/apt/apt.conf.d/