diff --git a/helpers/DATA/netcfg/restore_network-manager_management.patch b/helpers/DATA/netcfg/restore_network-manager_management.patch
new file mode 100644
index 0000000..645efc7
--- /dev/null
+++ b/helpers/DATA/netcfg/restore_network-manager_management.patch
@@ -0,0 +1,18 @@
+diff -ru netcfg-1.176+11.0trisquel1/finish-install.d/55netcfg-copy-config netcfg-1.142ubuntu8+10.0trisquel1/finish-install.d/55netcfg-copy-config
+--- netcfg-1.176+11.0trisquel1/finish-install.d/55netcfg-copy-config	2018-08-10 14:23:07.000000000 -0500
++++ netcfg-1.142ubuntu8+10.0trisquel1/finish-install.d/55netcfg-copy-config	2017-05-16 23:21:18.000000000 -0500
+@@ -59,6 +59,14 @@
+ 	mkdir -p /target/$FILE_PATH_NM_CONFIG
+ 	cp /$FILE_PATH_NM_CONFIG/* /target/$FILE_PATH_NM_CONFIG/
+ 
++	# Write netplan config file to hand over management to NM
++	cat <<EOF > /target/etc/netplan/01-network-manager-all.yaml
++# Let NetworkManager manage all devices on this system
++network:
++  version: 2
++  renderer: NetworkManager
++EOF
++
+ 	# Rewrite /etc/network/interfaces to contain only loopback
+ 	netcfg write_loopback
+ 	;;
diff --git a/helpers/make-netcfg b/helpers/make-netcfg
index 2b1dbcc..80b14ed 100644
--- a/helpers/make-netcfg
+++ b/helpers/make-netcfg
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 NETINST=true
@@ -25,6 +25,7 @@ NETINST=true
 
 rpl "Default: debian" "Default: trisquel" . -R
 sed -i '/client, template,/s/debian/trisquel/g' netcfg-common.c
+patch -p1 < $DATA/restore_networ-manager_management.patch
 
 changelog "Rebranded and adapted for Trisquel"
 compile