diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index 213985a1dd..29d6736191 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,5 +1,6 @@
 118
 - Update to 3.3.0.0
+- Moved ffmpegx to ffmpeg-tools add-on
 
 117
 - Update to 3.2.34.0
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 2b8a399aad..f2555c1df0 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -24,7 +24,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
-PKG_DEPENDS_TARGET="toolchain ffmpegx imagemagick"
+PKG_DEPENDS_TARGET="toolchain imagemagick"
 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"
@@ -33,7 +33,7 @@ PKG_TOOLCHAIN="manual"
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby Server"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_REQUIRES="tools.mono:0.0.0"
+PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.mono:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 unpack() {
@@ -51,11 +51,6 @@ addon() {
   sed -i 's/libsqlite3.so/libsqlite3.so.0/g' \
       $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono/SQLitePCLRaw.provider.sqlite3.dll.config
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -L $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/ffmpegx  \
-        $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/ffprobex \
-        $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q8.so.? \
         $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q8.so   \
diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start
index 319a8853e7..c40bf18123 100644
--- a/packages/addons/service/emby/source/bin/emby.start
+++ b/packages/addons/service/emby/source/bin/emby.start
@@ -1,7 +1,7 @@
 #!/bin/sh
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ mkdir -p $ADDON_HOME
 
 if [ "$emby_ffmpeg" != "false" ]
 then
-  emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
+  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpegx -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobex"
 fi
 
 mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \
diff --git a/packages/addons/service/emby/source/default.py b/packages/addons/service/emby/source/default.py
index 3999a0eb31..131e0e528d 100644
--- a/packages/addons/service/emby/source/default.py
+++ b/packages/addons/service/emby/source/default.py
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/packages/addons/service/emby/source/resources/language/English/strings.po b/packages/addons/service/emby/source/resources/language/English/strings.po
index 5b56896f44..37e80a8c99 100644
--- a/packages/addons/service/emby/source/resources/language/English/strings.po
+++ b/packages/addons/service/emby/source/resources/language/English/strings.po
@@ -1,4 +1,7 @@
 # Kodi Media Center language file
+# Addon Name: emby
+# Addon id: service.emby
+# Addon Provider: Team LibreELEC
 msgid ""
 msgstr ""
 
@@ -7,5 +10,5 @@ msgid "Configuration"
 msgstr ""
 
 msgctxt "#30001"
-msgid "Use dedicated ffmpeg/ffprobe (experimental)"
+msgid "Use dedicated ffmpeg/ffprobe"
 msgstr ""