diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
index 35b5fe43af..07d78cf435 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
@@ -20,6 +20,7 @@ post_makeinstall_target() {
   # Install rpi btuart script to bring up Bluetooth
   mkdir -p $INSTALL/usr/bin
     cp -P $PKG_DIR/scripts/rpi-btuart $INSTALL/usr/bin
+    cp -P $PKG_DIR/scripts/rpi-udev $INSTALL/usr/bin
 }
 
 post_install() {
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
new file mode 100755
index 0000000000..43a8a0a4af
--- /dev/null
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+ALIASES="/proc/device-tree/aliases"
+UARTX="uart${1}"
+
+if [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial0) ]; then
+  echo 0
+elif [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial1) ]; then
+  echo 1
+else
+  exit 1
+fi
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
old mode 100755
new mode 100644
index 334bd37d4b..a189a00267
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
@@ -1,21 +1,2 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial0) ]; then \
-            echo 0;\
-        elif [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi\
-    '", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial0) ]; then \
-            echo 0; \
-        elif [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi \
-    '", SYMLINK+="serial%c"
+KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c"
+KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c"
diff --git a/packages/linux/udev.d/30-disable-wakeup.rules b/packages/linux/udev.d/30-disable-wakeup.rules
index c4769477e9..817e5661e1 100644
--- a/packages/linux/udev.d/30-disable-wakeup.rules
+++ b/packages/linux/udev.d/30-disable-wakeup.rules
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 ACTION!="add|change", GOTO="end"
 
-DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'"
+DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys$devpath/power/wakeup'"
 
 LABEL="end"
diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index 249dd1992b..f7bacbd9cc 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -48,6 +48,8 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share
   rm -rf $INSTALL/etc/vmware-tools/scripts/vmware/network
 
+  chmod -x $INSTALL/usr/lib/udev/rules.d/*.rules
+
   find $INSTALL/etc/vmware-tools/ -type f | xargs sed -i '/.*expr.*/d'
 }
 
diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-0101-PR371.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-0101-PR371.patch
new file mode 100644
index 0000000000..f3e6632984
--- /dev/null
+++ b/packages/sysutils/open-vm-tools/patches/open-vm-tools-0101-PR371.patch
@@ -0,0 +1,22 @@
+From 81480daf43f5a42b268cc1c43d8c9e2164e5cd88 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Tue, 24 Sep 2019 13:20:51 +0100
+Subject: [PATCH] stop systemd-243 udev complaints
+
+---
+ udev/99-vmware-scsi-udev.rules | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/udev/99-vmware-scsi-udev.rules b/udev/99-vmware-scsi-udev.rules
+index 053b59706..051040ef7 100644
+--- a/udev/99-vmware-scsi-udev.rules
++++ b/udev/99-vmware-scsi-udev.rules
+@@ -2,6 +2,6 @@
+ #
+ # This file is part of open-vm-tools
+ 
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
+-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
++ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
+