diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk
deleted file mode 100644
index d354bc11b4..0000000000
--- a/packages/addons/addon-depends/chrome-depends/icu/package.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="icu"
-PKG_VERSION="61.1"
-PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
-PKG_LICENSE="Custom"
-PKG_SITE="http://www.icu-project.org"
-PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain icu:host"
-PKG_LONGDESC="International Components for Unicode library."
-
-PKG_ICU_OPTS="--disable-extras \
-              --disable-icuio \
-              --disable-layout \
-              --disable-renaming \
-              --disable-samples \
-              --disable-tests \
-              --disable-tools"
-
-PKG_CONFIGURE_OPTS_HOST="--enable-static \
-                         --disable-shared \
-                         $PKG_ICU_OPTS"
-
-configure_package() {
-  PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
-                             $PKG_ICU_OPTS"
-
-  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure"
-}
-
-post_makeinstall_target() {
-  rm -rf $INSTALL
-}
diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk
deleted file mode 100644
index 14c7a2a80c..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-. $(get_pkg_directory curl)/package.mk
-
-PKG_NAME="curl3"
-PKG_URL=""
-PKG_DEPENDS_UNPACK+=" curl"
-PKG_LONGDESC="curl for dotnet"
-
-unpack() {
-  mkdir -p $PKG_BUILD
-  cp -r $(get_build_dir curl)/* $PKG_BUILD
-  sed -i 's/CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@4/CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@3/g' $PKG_BUILD/lib/libcurl.vers.in
-}
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
-}
-
-post_makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk
deleted file mode 100644
index 195b301723..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="krb5"
-PKG_VERSION="1.18.2-final"
-PKG_SHA256="3a92fb44d06a60a79c71a031a528246bf4cf3badad150a2b91dfa7c4702c6c19"
-PKG_LICENSE="MIT"
-PKG_SITE="http://web.mit.edu/kerberos/"
-PKG_URL="https://github.com/krb5/krb5/archive/krb5-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="The Kerberos network authentication protocol."
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_regcomp=yes \
-                           ac_cv_printf_positional=yes \
-                           krb5_cv_attr_constructor_destructor=yes,yes"
-
-post_unpack() {
-  rm -rf $PKG_BUILD/doc
-  mv $PKG_BUILD/src/* $PKG_BUILD
-}
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
-}
diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk
deleted file mode 100644
index 11c3eb6eb2..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="lttng-ust"
-PKG_VERSION="2.12.0"
-PKG_SHA256="ae9a7c7a9730deabacc6c690dcf1ba1c988f7f474326ba33d30b3f339d27a059"
-PKG_LICENSE="LGPLv2.1"
-PKG_SITE="https://lttng.org/"
-PKG_URL="https://github.com/lttng/lttng-ust/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain userspace-rcu"
-PKG_LONGDESC="LTTng is an open source tracing framework for Linux"
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages --disable-numa"
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
-}
diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk
deleted file mode 100644
index aeb4b6df76..0000000000
--- a/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="userspace-rcu"
-PKG_VERSION="0.12.1"
-PKG_SHA256="19f31563db5078f47cabbb06bd7a3935a0964e31449efedd267f311ae79443c6"
-PKG_LICENSE="LGPLv2.1"
-PKG_SITE="http://liburcu.org"
-PKG_URL="https://github.com/urcu/userspace-rcu/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="userspace read-copy-update library"
-PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="+pic"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
-                           --enable-static"
diff --git a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk
deleted file mode 100644
index b1223aa65d..0000000000
--- a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="imagemagick"
-PKG_VERSION="7.0.10-23"
-PKG_SHA256="27f8a24858cc5658aa07a13002a41d342b88e5c4e1917ff4d503dbbf8cbff91c"
-PKG_LICENSE="http://www.imagemagick.org/script/license.php"
-PKG_SITE="http://www.imagemagick.org/"
-PKG_URL="https://github.com/ImageMagick/ImageMagick/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \
-                           --disable-static \
-                           --enable-shared \
-                           --with-pango=no \
-                           --with-utilities=no \
-                           --with-x=no"
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
-}
diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk
new file mode 100644
index 0000000000..a08eb4e227
--- /dev/null
+++ b/packages/addons/addon-depends/icu/package.mk
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="icu"
+PKG_VERSION="68.1"
+PKG_SHA256="5b3cfb519c20511c1c0429b093ec16960f6a6a0d7968a9065fda393f9eba48fc"
+PKG_LICENSE="Custom"
+PKG_SITE="http://www.icu-project.org"
+PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_TARGET="toolchain icu:host"
+PKG_LONGDESC="International Components for Unicode library."
+
+PKG_BUILD_FLAGS="-sysroot"
+
+configure_package() {
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/icu4c/source/configure"
+  PKG_CONFIGURE_OPTS_TARGET="--disable-layout \
+                             --disable-layoutex \
+                             --disable-renaming \
+                             --disable-samples \
+                             --disable-tests \
+                             --disable-tools \
+                             --with-cross-build=${PKG_BUILD}/.${HOST_NAME}"
+}
diff --git a/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch
new file mode 100644
index 0000000000..8f740c86cd
--- /dev/null
+++ b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch
@@ -0,0 +1,12 @@
+diff -Naur icu4c-67-1/icu-release-67-1/icu4c/source/config/mh-linux icu4c-67-1-ldflags/icu-release-67-1/icu4c/source/config/mh-linux
+--- icu-release-67-1/icu4c/source/config/mh-linux	2020-04-22 19:49:10.000000000 +0200
++++ icu-release-67-1.ldflags/icu4c/source/config/mh-linux	2020-09-05 17:58:05.635014182 +0200
+@@ -23,7 +23,7 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
deleted file mode 100644
index 731e2f8c94..0000000000
--- a/packages/addons/service/emby/changelog.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-124
-- Update to 3.5.3.0
-- Update imagemagick to 7.0.8-11
-
-123
-- Update to 3.5.2.0
-- Update imagemagick to 7.0.8-10 and build it without pango
-
-122
-- Bump addon
-
-121
-- Update to 3.5.1.0 for netcore
-
-120
-- Use ffmpeg instead of ffmpegx
-
-119
-- Update to 3.4.1.6
-- Add script (emby-update) to update Emby
-
-118
-- Update to 3.3.0.0
-- Moved ffmpegx to ffmpeg-tools add-on
-
-117
-- Update to 3.2.34.0
-- Use reworked ffmpegx
-
-116
-- Update to verson 3.2.27.0
-- Rename to Emby Server
-
-115
-- Update to version 3.2.26.0
-
-114
-- Update to version 3.2.17.0
-- Rebuild libx264, ffmpegx and imagemagick
-- Use ffmpgex by default
-
-113:
-- Update to version 3.2.8
-- Rebuild x264 and ffmpegx
-
-112:
-- Refer to libMagickWand-7
-
-111:
-- Updated to version 3.2.5
-- Rebuild libx264, ffmpegx and imagemagick
-
-110:
-- Rebuild ffmpegx with libx264
-
-109:
-- Rebuild ffmpgex and imagemagick
-
-108:
-- Update to version 3.0.8500
-
-107:
-- Update to version 3.0.8300
-- Rebuild ffmpegx
-
-106:
-- Updat to version 3.0.8100
-- Rebuild ffmpegx
-
-105:
-- Update to version 3.0.7100
-
-104:
-- Update to version 3.0.6300
-- Rebuild ffmpegx
-
-103:
-- Update to version 3.0.6070
-- Build for all architectures
-- Refer to libsqlite3.so.0 instead of libsqlite3.so
-
-102:
-- Update to version 3.0.6030
-- Add dedicated ffmpeg and ffprobe
-- Remove unused shared libraries
-
-101:
-- Update to version 3.0.5985
-- Removed mono build dependency
-
-100:
-- Initial release
diff --git a/packages/addons/service/emby/icon/icon.png b/packages/addons/service/emby/icon/icon.png
deleted file mode 100644
index 2674bc985b..0000000000
Binary files a/packages/addons/service/emby/icon/icon.png and /dev/null differ
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 3b56918423..c5013b6849 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -2,34 +2,24 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="emby"
-PKG_VERSION="3.5.3.0"
-PKG_SHA256="f25abb6d34f888c467db561ad333a222626febdc69b6353de86c04848753210c"
-PKG_REV="124"
+PKG_VERSION="1.0"
+PKG_REV="125"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
-PKG_SITE="http://emby.media"
-PKG_URL="https://github.com/MediaBrowser/Emby.Releases/releases/download/$PKG_VERSION/embyserver-netcore_$PKG_VERSION.zip"
-PKG_SOURCE_DIR="system"
-PKG_DEPENDS_TARGET="toolchain imagemagick"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service"
-PKG_SHORTDESC="Emby Server: a personal media server"
-PKG_LONGDESC="Emby Server ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
+PKG_SHORTDESC="Add-on removed"
+PKG_LONGDESC="Add-on removed"
 PKG_TOOLCHAIN="manual"
 
+PKG_ADDON_BROKEN="Emby Server is no longer maintained and has been superseded by Emby Server 4"
+
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby Server"
-PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.dotnet-runtime:0.0.0"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_ADDON_TYPE="xbmc.broken"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/emby
-  cp -r $PKG_BUILD/* \
-        -d $ADDON_BUILD/$PKG_ADDON_ID/emby
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -L $(get_install_dir imagemagick)/usr/lib/libMagickCore-7.Q16HDRI.so.? \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -L $(get_install_dir imagemagick)/usr/lib/libMagickWand-7.Q16HDRI.so \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
+  :
 }
diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start
deleted file mode 100644
index e23868ab56..0000000000
--- a/packages/addons/service/emby/source/bin/emby.start
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon service.emby
-
-LD_PRELOAD="$ADDON_DIR/lib/libMagickCore-7.Q16HDRI.so.6 \
-            $ADDON_DIR/lib/CORE_RL_Wand_.so" \
-nice -n "$emby_nice" \
-le_dotnet $ADDON_DIR/emby/EmbyServer.dll -programdata $ADDON_HOME
diff --git a/packages/addons/service/emby/source/default.py b/packages/addons/service/emby/source/default.py
deleted file mode 100644
index 3b7ab1a1e6..0000000000
--- a/packages/addons/service/emby/source/default.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-import subprocess
-import xbmc
-import xbmcaddon
-
-
-class Monitor(xbmc.Monitor):
-
-   def __init__(self, *args, **kwargs):
-      xbmc.Monitor.__init__(self)
-      self.id = xbmcaddon.Addon().getAddonInfo('id')
-
-   def onSettingsChanged(self):
-      subprocess.call(['systemctl', 'restart', self.id])
-
-
-if __name__ == '__main__':
-   Monitor().waitForAbort()
diff --git a/packages/addons/service/emby/source/resources/language/English/strings.po b/packages/addons/service/emby/source/resources/language/English/strings.po
deleted file mode 100644
index 609e47bd59..0000000000
--- a/packages/addons/service/emby/source/resources/language/English/strings.po
+++ /dev/null
@@ -1,14 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: emby
-# Addon id: service.emby
-# Addon Provider: Team LibreELEC
-msgid ""
-msgstr ""
-
-msgctxt "#30000"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "#30001"
-msgid "Priority (nice, 0=max, 19=min)"
-msgstr ""
diff --git a/packages/addons/service/emby/source/resources/settings.xml b/packages/addons/service/emby/source/resources/settings.xml
deleted file mode 100644
index 2325485e41..0000000000
--- a/packages/addons/service/emby/source/resources/settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-   <category   label="30000">
-      <setting label="30001" id="emby_nice" type="slider" default="10" range="0,1,19" option="int" />
-    </category>
-</settings>
diff --git a/packages/addons/service/emby/source/settings-default.xml b/packages/addons/service/emby/source/settings-default.xml
deleted file mode 100644
index 8d35529581..0000000000
--- a/packages/addons/service/emby/source/settings-default.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<settings version="2">
-    <setting id="emby_nice" default="true">10</setting>
-</settings>
diff --git a/packages/addons/service/emby/source/system.d/service.emby.service b/packages/addons/service/emby/source/system.d/service.emby.service
deleted file mode 100644
index 5859e94281..0000000000
--- a/packages/addons/service/emby/source/system.d/service.emby.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Emby - streaming server
-Documentation=http://emby.media
-After=network.target
-Requires=network.target
-
-[Service]
-ExecStart=/bin/sh /storage/.kodi/addons/service.emby/bin/emby.start
-Restart=always
-
-[Install]
-WantedBy=kodi.target
-
diff --git a/packages/addons/service/emby4/changelog.txt b/packages/addons/service/emby4/changelog.txt
index cf7eb36ca3..c5249766b5 100644
--- a/packages/addons/service/emby4/changelog.txt
+++ b/packages/addons/service/emby4/changelog.txt
@@ -1,3 +1,6 @@
+109
+- Bootstrap
+
 108
 - Update to 4.4.2.0
 - Fix system.d
diff --git a/packages/addons/service/emby4/package.mk b/packages/addons/service/emby4/package.mk
index a9b275f1d7..41009be784 100644
--- a/packages/addons/service/emby4/package.mk
+++ b/packages/addons/service/emby4/package.mk
@@ -2,34 +2,24 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="emby4"
-PKG_VERSION="4.4.3.0"
-PKG_SHA256="9f14243bdc400ca9da2bb1b3e2ca3755f96293a6016bfbb5689cd7fcbc963f6b"
-PKG_REV="108"
+PKG_VERSION="bootstrap"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="prop."
 PKG_SITE="http://emby.media"
-PKG_URL="https://github.com/MediaBrowser/Emby.Releases/releases/download/$PKG_VERSION/embyserver-netcore_$PKG_VERSION.zip"
-PKG_SOURCE_DIR="system"
-PKG_DEPENDS_TARGET="toolchain imagemagick"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby Server: a personal media server"
-PKG_LONGDESC="Emby Server ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device."
+PKG_LONGDESC="Emby Server brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby Server 4"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROJECTS="any !RPi1"
 PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.dotnet-runtime:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/emby
-  cp -r $PKG_BUILD/* \
-        -d $ADDON_BUILD/$PKG_ADDON_ID/emby
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -L $(get_install_dir imagemagick)/usr/lib/libMagickCore-7.Q16HDRI.so.? \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -L $(get_install_dir imagemagick)/usr/lib/libMagickWand-7.Q16HDRI.so \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
+  :
 }
diff --git a/packages/addons/service/emby4/source/bin/emby4.start b/packages/addons/service/emby4/source/bin/emby4.start
index 7e445e04cd..a700bd9eca 100644
--- a/packages/addons/service/emby4/source/bin/emby4.start
+++ b/packages/addons/service/emby4/source/bin/emby4.start
@@ -1,15 +1,32 @@
 #!/bin/sh
-
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 . /etc/profile
 oe_setup_addon service.emby4
 
-LD_PRELOAD="$ADDON_DIR/lib/libMagickCore-7.Q16HDRI.so.7 \
-            $ADDON_DIR/lib/CORE_RL_Wand_.so" \
+libs="${ADDON_DIR}/libs"
+ff="/storage/.kodi/addons/tools.ffmpeg-tools/bin"
+
+if [ ! -e "${libs}" ]; then
+  url="https://github.com/MediaBrowser/Emby.Releases/releases"
+  url_latest="${url}/latest"
+  release="$(basename $(curl -fso /dev/null -w %{redirect_url} ${url_latest}))"
+  url_download="${url}/download/${release}/embyserver-netcore_${release}.zip"
+  zip="${ADDON_DIR}/bootstrap.zip"
+  tmp="${ADDON_DIR}/tmp"
+  rm -fr "${tmp}" "${zip}"
+  mkdir -p "${tmp}"
+  wget -q "${url_download}" -O "${zip}" && \
+  unzip "${zip}" -d "${tmp}" && \
+  mv "${tmp}" "${libs}" && \
+  rm -f "${zip}" || \
+  exit 1
+fi
+
+exec \
 nice -n "$emby_nice" \
-le_dotnet $ADDON_DIR/emby/EmbyServer.dll \
-  -programdata $ADDON_HOME \
-  -ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg \
-  -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe
+dotnet "${libs}/system/EmbyServer.dll" \
+  -programdata "${ADDON_HOME}" \
+  -ffmpeg "${ff}/ffmpeg" \
+  -ffprobe "${ff}/ffprobe"
diff --git a/packages/addons/service/emby4/source/system.d/service.emby4.service b/packages/addons/service/emby4/source/system.d/service.emby4.service
index dde2457408..37a75c1a01 100644
--- a/packages/addons/service/emby4/source/system.d/service.emby4.service
+++ b/packages/addons/service/emby4/source/system.d/service.emby4.service
@@ -3,10 +3,10 @@ Description=Emby 4 - streaming server
 Documentation=http://emby.media
 Wants=multi-user.target
 After=multi-user.target
-Conflicts=service.emby.service
 
 [Service]
-ExecStart=/bin/sh /storage/.kodi/addons/service.emby4/bin/emby4.start
+SyslogIdentifier=%N
+ExecStart=/bin/sh /storage/.kodi/addons/%N/bin/emby4.start
 Restart=always
 
 [Install]
diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt
index e13b8d5c61..40aa078fe7 100644
--- a/packages/addons/tools/dotnet-runtime/changelog.txt
+++ b/packages/addons/tools/dotnet-runtime/changelog.txt
@@ -1,3 +1,9 @@
+111
+- Update to ASP.NET Core Runtime 3.1.9
+- Download source to architecture specific file
+- Add icu4c libraries
+- Remove superfluous libraries
+
 110
 - Update to 3.1.5
 
diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk
index cefb27e232..3d6d9d7564 100644
--- a/packages/addons/tools/dotnet-runtime/package.mk
+++ b/packages/addons/tools/dotnet-runtime/package.mk
@@ -1,31 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
-case "$ARCH" in
-  "aarch64")
-    PKG_NC_ARCH="arm64"
-    PKG_SHA256="05875790fbfc487cefb04fc6ff6d9a3ade147f1ae554e859dca60ea6a3c232aa"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/65291ed8-e931-4605-9d5a-265928a835d0/1a15d18655c8b260170117e9bd1a1cb7/dotnet-runtime-3.1.5-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_NC_ARCH="arm"
-    PKG_SHA256="5728786f517410f25c59799f443d0336129d6b1680fd40cb5b40202407949008"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/15132a5c-f0f4-4373-8b8b-b7e70834d899/cad479dda52359ad43956471274ec932/dotnet-runtime-3.1.5-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_NC_ARCH="x64"
-    PKG_SHA256="ae0a4e9a1e875b46d3201cdad2779572de1c12c0aae36688ae3c3978db319ff5"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d00eaeea-6d7b-4e73-9d96-c0234ed3b665/0d25d9d1aeaebdeef01d15370d5cd22b/dotnet-runtime-3.1.5-linux-x64.tar.gz"
-    ;;
-esac
-
 PKG_NAME="dotnet-runtime"
-PKG_VERSION="3.1.5"
-PKG_REV="110"
+PKG_VERSION="3.1.9"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.github.io/"
-PKG_DEPENDS_TARGET="toolchain curl curl3 krb5 lttng-ust"
+PKG_DEPENDS_TARGET="toolchain icu"
 PKG_SECTION="tools"
 PKG_SHORTDESC=".NET Core Runtime"
 PKG_LONGDESC=".NET Core Runtime ($PKG_VERSION) runs applications built with .NET Core, a cross-platform .NET implementation."
@@ -33,22 +15,32 @@ PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME=".Net Core Runtime"
+PKG_ADDON_PROJECTS="any !RPi1"
 PKG_ADDON_TYPE="xbmc.python.script"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
+case "${ARCH}" in
+  "aarch64")
+    PKG_SHA256="1ffe06b0012feb52d75e748438695e11905343890de73a594e6540d535fd084c"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/dffd493f-9eb8-483f-81c7-a9e2201574ef/54e7464241e01e7031fd89e6fe88e6da/aspnetcore-runtime-3.1.9-linux-arm64.tar.gz"
+    ;;
+  "arm")
+    PKG_SHA256="496247dc5098a506accb0c3286f82e497a6da30f4d0b8262c29484c096d5f717"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c8cd43dd-e9de-4ff9-9cea-2f02fba6869c/d5c653c12ec93cb71e30b21856acea66/aspnetcore-runtime-3.1.9-linux-arm.tar.gz"
+    ;;
+  "x86_64")
+    PKG_SHA256="b47a882277d4ef42d3cfebbd1f334559b8345fe8a8b05e2a7d83a37ffe5f775e"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/933b0cb8-3494-4ca4-8c9e-1bcfd3568ab0/8704eef073efdfecdaaad4a18beb05ac/aspnetcore-runtime-3.1.9-linux-x64.tar.gz"
+    ;;
+esac
+PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"
+
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -r $PKG_BUILD/* \
-        $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -r $PKG_BUILD/* \
+          $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/libs
-  cp -L $(get_install_dir curl3)/usr/lib/libcurl.so.? \
-        $(get_install_dir krb5)/usr/lib/libcom_err.so.? \
-        $(get_install_dir krb5)/usr/lib/libgssapi_krb5.so.? \
-        $(get_install_dir krb5)/usr/lib/libk5crypto.so.? \
-        $(get_install_dir krb5)/usr/lib/libkrb5.so.? \
-        $(get_install_dir krb5)/usr/lib/libkrb5support.so.? \
-        $(get_install_dir lttng-ust)/usr/lib/liblttng-ust.so.? \
-        $(get_install_dir lttng-ust)/usr/lib/liblttng-ust-tracepoint.so.? \
-        $ADDON_BUILD/$PKG_ADDON_ID/libs
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+    cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \
+          $ADDON_BUILD/$PKG_ADDON_ID/lib/
 }
diff --git a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet b/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet
deleted file mode 100644
index c5ed97d3c7..0000000000
--- a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon tools.dotnet-runtime
-
-DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="1" \
-LD_LIBRARY_PATH="$ADDON_DIR/libs:$LD_LIBRARY_PATH" \
-dotnet "$@"