diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index 8e037e33dd..cdce943f80 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,3 +1,8 @@
+8.0.102
+- Updated to version 3.0.6030
+- Added dedicated ffmpeg and ffprobe
+- Removed unused shared libraries
+
 8.0.101
 - Updated to version 3.0.5985
 - Removed mono build dependency
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 01345e6320..09042dd719 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.0.5985"
-PKG_REV="101"
+PKG_VERSION="3.0.6030"
+PKG_REV="102"
 PKG_ARCH="arm x86_64"
 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 imagemagick"
+PKG_DEPENDS_TARGET="toolchain ffmpegx imagemagick"
 PKG_PRIORITY="optional"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby: a personal media server"
@@ -55,6 +55,13 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
   unzip -q $ROOT/$SOURCES/$PKG_NAME/$PKG_SOURCE_NAME -d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
 
+  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 -PR $(get_build_dir imagemagick)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-6.Q8.so.2 \
+        $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-6.Q8.so   \
+        $ADDON_BUILD/$PKG_ADDON_ID/lib/
 }
diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start
index dbed4da513..9caee9e7cc 100644
--- a/packages/addons/service/emby/source/bin/emby.start
+++ b/packages/addons/service/emby/source/bin/emby.start
@@ -21,7 +21,12 @@
 oe_setup_addon service.emby
 
 chmod +x $ADDON_DIR/bin/*
-
 mkdir -p $ADDON_HOME
 
-mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME
+if [ "$emby_ffmpeg" = "true" ]
+then
+  emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
+fi
+
+mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \
+  $emby_flags
diff --git a/packages/addons/service/emby/source/resources/language/English/strings.po b/packages/addons/service/emby/source/resources/language/English/strings.po
new file mode 100644
index 0000000000..5b56896f44
--- /dev/null
+++ b/packages/addons/service/emby/source/resources/language/English/strings.po
@@ -0,0 +1,11 @@
+# Kodi Media Center language file
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Use dedicated ffmpeg/ffprobe (experimental)"
+msgstr ""
diff --git a/packages/addons/service/emby/source/resources/settings.xml b/packages/addons/service/emby/source/resources/settings.xml
new file mode 100644
index 0000000000..d213cf69e2
--- /dev/null
+++ b/packages/addons/service/emby/source/resources/settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <category   label="30000">
+      <setting label="30001" id="emby_ffmpeg" type="bool" default="false" />
+    </category>
+</settings>