diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index 552cab71ea..b8448939f9 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,52 +1,56 @@
-113
-- Updated to version 3.2.8
-- Rebuilt x264 and ffmpegx
+114:
+- Update to version 3.2.17.0
+- Rebuild libx264, ffmpegx and imagemagick
+- Use ffmpgex by default
 
-112
+113:
+- Update to version 3.2.8
+- Rebuild x264 and ffmpegx
+
+112:
 - Refer to libMagickWand-7
 
-111
+111:
 - Updated to version 3.2.5
-- Rebuilt libx264, ffmpegx and imagemagick
+- Rebuild libx264, ffmpegx and imagemagick
 
-110
+110:
 - Rebuild ffmpegx with libx264
 
-109
-- Rebuilt ffmpgex and imagemagick
+109:
+- Rebuild ffmpgex and imagemagick
 
-108
-- Updated to version 3.0.8500
+108:
+- Update to version 3.0.8500
 
+107:
+- Update to version 3.0.8300
+- Rebuild ffmpegx
 
-107
-- Updated to version 3.0.8300
-- Rebuilt ffmpegx
+106:
+- Updat to version 3.0.8100
+- Rebuild ffmpegx
 
-106
-- Updated to version 3.0.8100
-- Rebuilt ffmpegx
+105:
+- Update to version 3.0.7100
 
-105
-- Updated to version 3.0.7100
+104:
+- Update to version 3.0.6300
+- Rebuild ffmpegx
 
-104
-- Updated to version 3.0.6300
-- Rebuilt ffmpegx
-
-103
-- Updated to version 3.0.6070
+103:
+- Update to version 3.0.6070
 - Build for all architectures
 - Refer to libsqlite3.so.0 instead of libsqlite3.so
 
-102
-- Updated to version 3.0.6030
-- Added dedicated ffmpeg and ffprobe
-- Removed unused shared libraries
+102:
+- Update to version 3.0.6030
+- Add dedicated ffmpeg and ffprobe
+- Remove unused shared libraries
 
-101
-- Updated to version 3.0.5985
+101:
+- Update to version 3.0.5985
 - Removed mono build dependency
 
-100
+100:
 - Initial release
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 1057f6c612..7b6aaa31f7 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -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
@@ -17,9 +17,8 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.2.8"
-PKG_REV="113"
-PKG_ARCH="any"
+PKG_VERSION="3.2.17.0"
+PKG_REV="114"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start
index 9caee9e7cc..319a8853e7 100644
--- a/packages/addons/service/emby/source/bin/emby.start
+++ b/packages/addons/service/emby/source/bin/emby.start
@@ -23,7 +23,7 @@ oe_setup_addon service.emby
 chmod +x $ADDON_DIR/bin/*
 mkdir -p $ADDON_HOME
 
-if [ "$emby_ffmpeg" = "true" ]
+if [ "$emby_ffmpeg" != "false" ]
 then
   emby_flags="-ffmpeg $ADDON_DIR/bin/ffmpegx -ffprobe $ADDON_DIR/bin/ffprobex"
 fi
diff --git a/packages/addons/service/emby/source/resources/settings.xml b/packages/addons/service/emby/source/resources/settings.xml
index d213cf69e2..0d08d8d297 100644
--- a/packages/addons/service/emby/source/resources/settings.xml
+++ b/packages/addons/service/emby/source/resources/settings.xml
@@ -1,6 +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" />
+      <setting label="30001" id="emby_ffmpeg" type="bool" default="true" />
     </category>
 </settings>