diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index 66d35dda70..04f91bc349 100755
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -25,8 +25,9 @@ armada-xp-linksys-mamba)
                "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" "4:wan" "6@eth1"
        ;;
 armada-385-turris-omnia)
-       ucidef_set_interface_lan "lan0 lan1 lan2 lan3 lan4"
        ucidef_set_interface_wan "eth2"
+       ucidef_add_switch "switch0" \
+                "0:lan:0" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "5@eth1" "6@eth0"
        ;;
 armada-388-clearfog-*)
        # eth0 is standalone ethernet
diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
index 6bc6269da6..6eba1632ef 100644
--- a/target/linux/mvebu/image/cortex-a9.mk
+++ b/target/linux/mvebu/image/cortex-a9.mk
@@ -162,7 +162,7 @@ define Device/turris-omnia
   DEVICE_TITLE := Turris Omnia
   DEVICE_PACKAGES :=  \
     mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
-    wpad-mini kmod-ath9k kmod-ath10k ath10k-firmware-qca988x
+    wpad-mini kmod-ath9k kmod-ath10k ath10k-firmware-qca988x swconfig
   IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz
   IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata
   IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip
diff --git a/target/linux/mvebu/patches-4.14/003-add_switch_nodes.patch b/target/linux/mvebu/patches-4.14/003-add_switch_nodes.patch
index 5d43d9f0f8..2f36d8c127 100644
--- a/target/linux/mvebu/patches-4.14/003-add_switch_nodes.patch
+++ b/target/linux/mvebu/patches-4.14/003-add_switch_nodes.patch
@@ -38,3 +38,23 @@
  };

  &ahci0 {
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -82,6 +82,17 @@
+                       };
+               };
+       };
++
++      mvsw61xx {
++              compatible = "marvell,88e6176";
++              status = "okay";
++              reg = <0x10>;
++              is-indirect;
++
++              mii-bus = <&mdio>;
++              cpu-port-0 = <6>;
++              cpu-port-1 = <5>;
++      };
+ };
+
+ /* Connected to 88E6176 switch, port 6 */
diff --git a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
index 5df94bdfad..eeb17bdbd0 100644
--- a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
+++ b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
@@ -28,3 +28,13 @@
                compatible = "marvell,mv88e6085";
                #address-cells = <1>;
                #size-cells = <0>;
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -253,6 +253,7 @@
+
+       /* Switch MV88E6176 at address 0x10 */
+       switch@10 {
++              status = "disabled";
+               compatible = "marvell,mv88e6085";
+               #address-cells = <1>;
+               #size-cells = <0>;
diff --git a/target/linux/mvebu/patches-4.14/225-ARM-dts-armada-385-turris-omnia-phy-mode-rgmii-id.patch b/target/linux/mvebu/patches-4.14/225-ARM-dts-armada-385-turris-omnia-phy-mode-rgmii-id.patch
new file mode 100644
index 0000000000..4ef2ec3ba1
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/225-ARM-dts-armada-385-turris-omnia-phy-mode-rgmii-id.patch
@@ -0,0 +1,20 @@
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -100,7 +100,7 @@
+       pinctrl-names = "default";
+       pinctrl-0 = <&ge0_rgmii_pins>;
+       status = "okay";
+-      phy-mode = "rgmii";
++      phy-mode = "rgmii-id";
+
+       fixed-link {
+               speed = <1000>;
+@@ -113,7 +113,7 @@
+       pinctrl-names = "default";
+       pinctrl-0 = <&ge1_rgmii_pins>;
+       status = "okay";
+-      phy-mode = "rgmii";
++      phy-mode = "rgmii-id";
+
+       fixed-link {
+               speed = <1000>;