diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
index 84aca0473d..2cedd3f94f 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20180517-2245"
-PKG_SHA256="55c6558ca6458f92939a53f669a4e51b104c2275f22984393e36fb670528bcbf"
+PKG_VERSION="snapshot-20180627-2245"
+PKG_SHA256="4fa2bcd818fa0ec197c027b3d38ba587ebc4cfb956c2b24deb37e69a46999daf"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
index c1a8e026eb..4a7d5a6702 100644
--- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="x265"
-PKG_VERSION="2.7"
-PKG_SHA256="1a731cd6e70ca26a332bb42f089da2eedfc16f606653140bef8ff48c9042a274"
+PKG_VERSION="2.8"
+PKG_SHA256="fbd8a89b4a1391c6b504b91b69df440e3ef14afc8fddfcc209281c9159d83a86"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/videolan/x265"
diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk
index 84bed38668..62808d6966 100644
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -17,17 +17,16 @@
 ################################################################################
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="4.0"
-PKG_SHA256="95296f881f7e367731a35a71e3df5ebe9360cd4c859f06793bf8dcf917ee8e5a"
+PKG_VERSION="4.0.1"
+PKG_SHA256="cbb7c3ed5b7a669962dfe7c58dc495279274ac259e75770cccf2d2b0115ff5fb"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://github.com/FFmpeg/FFmpeg/archive/n${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="FFmpeg-n${PKG_VERSION}"
-PKG_DEPENDS_TARGET="toolchain bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib"
 PKG_SECTION="multimedia"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding"
-# ffmpeg builds better with these options
 PKG_BUILD_FLAGS="-gold"
 
 # Dependencies
@@ -189,7 +188,6 @@ configure_target() {
     --extra-cflags="$CFLAGS" \
     --extra-ldflags="$LDFLAGS" \
     --extra-libs="$PKG_FFMPEG_LIBS" \
-    --extra-version="x" \
     --enable-pic \
     --enable-openssl \
     \
@@ -201,7 +199,3 @@ configure_target() {
 makeinstall_target() {
   make install DESTDIR="$INSTALL/../.INSTALL_PKG"
 }
-
-post_makeinstall_target() {
-  for ff in "$INSTALL/../.INSTALL_PKG/usr/local/bin/"*; do mv "$ff" "${ff}x"; done
-}
diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index af54dc6454..28da3b2115 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,3 +1,6 @@
+120
+- Use ffmpeg instead of ffmpegx
+
 119
 - Update to 3.4.1.6
 - Add script (emby-update) to update Emby
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 3edc3101d1..82f4c8ad59 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -19,7 +19,7 @@
 PKG_NAME="emby"
 PKG_VERSION="3.4.1.6"
 PKG_SHA256="8eb129f538cefec612239932fd85ddc6bd5221cd97613e142f41f2126412ea04"
-PKG_REV="119"
+PKG_REV="120"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start
index c40bf18123..72160513c3 100644
--- a/packages/addons/service/emby/source/bin/emby.start
+++ b/packages/addons/service/emby/source/bin/emby.start
@@ -25,7 +25,7 @@ mkdir -p $ADDON_HOME
 
 if [ "$emby_ffmpeg" != "false" ]
 then
-  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpegx -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobex"
+  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe"
 fi
 
 mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \
diff --git a/packages/addons/tools/ffmpeg-tools/changelog.txt b/packages/addons/tools/ffmpeg-tools/changelog.txt
index 759ae56a2a..29563a3834 100644
--- a/packages/addons/tools/ffmpeg-tools/changelog.txt
+++ b/packages/addons/tools/ffmpeg-tools/changelog.txt
@@ -1,3 +1,10 @@
+102
+- Rename binary to ffmpeg (no ffmpegx anymore)
+- Update AV1 to 96ee0eb
+- Update FFmpeg to 4.0.1
+- Update X264 to 20180627
+- Update X265 to 2.8
+
 101
 - Update to FFmpeg 4.0
 - Added AV1 codec
diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk
index 4ff807c9ff..fad0cf5e0e 100644
--- a/packages/addons/tools/ffmpeg-tools/package.mk
+++ b/packages/addons/tools/ffmpeg-tools/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="ffmpeg-tools"
 PKG_VERSION="1.0"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk
index 08f8ab0afb..68d000268a 100644
--- a/packages/multimedia/aom/package.mk
+++ b/packages/multimedia/aom/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="aom"
-PKG_VERSION="a586982"
-PKG_SHA256="078c0cc780fa9fcd3d67456722339a8eaa5591a484e1daae9fc2c3c34810ec46"
+PKG_VERSION="96ee0eb"
+PKG_SHA256="37c8d930cc105ccad4987c65751400fc42819b77fd487c9ef19cadee0c95a2d8"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 5270d2be36..b8e361a241 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -216,7 +216,8 @@ configure_target() {
               --disable-altivec \
               $PKG_FFMPEG_FPU \
               $PKG_FFMPEG_X86ASM \
-              --disable-symver
+              --disable-symver \
+              --disable-programs
 }
 
 post_makeinstall_target() {