diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz
new file mode 100644
index 0000000..ea69609
Binary files /dev/null and b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz differ
diff --git a/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a b/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a
deleted file mode 100644
index 4320646..0000000
--- a/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a
+++ /dev/null
@@ -1,19 +0,0 @@
-[connection]
-id=ethernet
-uuid=2a2b6485-4d06-4b86-8051-751399c6881a
-type=ethernet
-permissions=
-secondaries=
-
-[ethernet]
-mac-address-blacklist=
-
-[ipv4]
-address1=192.168.1.1/24
-dns-search=
-method=manual
-
-[ipv6]
-addr-gen-mode=stable-privacy
-dns-search=
-method=auto
diff --git a/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch b/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch
new file mode 100644
index 0000000..ccafa11
--- /dev/null
+++ b/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch
@@ -0,0 +1,14 @@
+--- a/src/platform/nm-linux-platform.c  2018-02-21 11:51:49.400483978 +0100
++++ b/src/platform/nm-linux-platform.c	2018-02-21 11:52:27.621125455 +0100
+@@ -745,6 +745,11 @@
+ 			 * aside from the DEVTYPE. */
+ 			if (!g_strcmp0 (devtype, "gadget"))
+ 				return NM_LINK_TYPE_ETHERNET;
++
++			/* Distributed Switch Architecture switch chips */
++			if (!g_strcmp0 (devtype, "dsa"))
++				return NM_LINK_TYPE_ETHERNET;
++
+ 		}
+ 	}
+ 
diff --git a/recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz
new file mode 100644
index 0000000..8071ada
Binary files /dev/null and b/recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz differ
diff --git a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
index 0bbf46a..e7d7b61 100644
--- a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+++ b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPAHT_prepend := "${THISDIR}/${MACHINE}"
+FILESEXTRAPAHT_prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
 SUMMARY = "NetworkManager"
 SECTION = "net/misc"
@@ -10,13 +10,13 @@ DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp li
 
 inherit gnome gettext systemd
 
-INITIAL_CONNECTION = "ethernet-2a2b6485-4d06-4b86-8051-751399c6881a"
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
-    file://${INITIAL_CONNECTION} \
+    file://system-connections.tar.gz \
     file://NetworkManager.conf \
+    file://support-dsa.patch \
 "
 SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75"
 SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309"
@@ -95,7 +95,7 @@ SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
     mkdir -p ${D}${sysconfdir}/NetworkManager/system-connections
-    install -m 0600 ${WORKDIR}/${INITIAL_CONNECTION} ${D}${sysconfdir}/NetworkManager/system-connections/
+    install -m 0600 ${WORKDIR}/system-connections/* ${D}${sysconfdir}/NetworkManager/system-connections/
 
     install -m 0600 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
 }