diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
index 7245e7afc6..111f960642 100644
--- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="ffmpegx"
 PKG_VERSION="libreelec"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
@@ -46,6 +46,11 @@ pre_configure_target() {
     FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi"
   fi
 
+# ffmpeg does not build with libx264 on aarch64
+  if [ "$TARGET_ARCH" != "aarch64" ]; then
+    FFMPEG_X264="--enable-libx264"
+  fi
+
   if [ "$TARGET_ARCH" == "arm" ]; then
     FFMPEG_ARM_AO="--enable-hardcoded-tables"
   fi
diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index 22217738aa..0701806b3f 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,3 +1,6 @@
+110
+- Rebuild ffmpegx with libx264
+
 109
 - Rebuilt ffmpgex and imagemagick
 
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index f6bce83f14..0b90ee47f5 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="emby"
 PKG_VERSION="3.0.8500"
-PKG_REV="109"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk
index e81525ced5..db2c6c8272 100644
--- a/packages/x11/lib/libX11/package.mk
+++ b/packages/x11/lib/libX11/package.mk
@@ -56,4 +56,5 @@ pre_configure_target() {
   export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
   export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
   export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
+  unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
 }