diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
index 806c1d07ff..17f8a8e4e2 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmtp"
-PKG_VERSION="1.1.21"
-PKG_SHA256="c4ffa5ab8c8f48c91b0047f2e253c101c418d5696a5ed65c839922a4280872a7"
+PKG_VERSION="1.1.22"
+PKG_SHA256="c3fcf411aea9cb9643590cbc9df99fa5fe30adcac695024442973d76fa5f87bc"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libmtp.sourceforge.net/"
 PKG_URL="${SOURCEFORGE_SRC}/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@@ -14,8 +14,20 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --disable-shared \
                            --enable-static \
+                           --enable-crossbuilddir \
                            --disable-mtpz"
 
+pre_configure_target() {
+  # override mtp-hotplug with true as the built files are not used.
+  # the generated udev files are deleted is the post_makeinstall_target.
+  export HOST_MTP_HOTPLUG="/usr/bin/true"
+}
+
 post_configure_target() {
   libtool_remove_rpath libtool
 }
+
+post_makeinstall_target() {
+  safe_remove ${INSTALL}/usr/lib/udev/hwdb.d
+  safe_remove ${INSTALL}/usr/lib/udev/rules.d
+}
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch
similarity index 66%
rename from packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch
rename to packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch
index 3bb6db9653..1f2fbf9e23 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch
+++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch
@@ -7,28 +7,6 @@ diff -Naur a/Makefile.am b/Makefile.am
  ACLOCAL_AMFLAGS=-I m4
  
  pkgconfigdir=$(libdir)/pkgconfig
-@@ -11,21 +11,6 @@
- if USE_LINUX
- udevrulesdir=@UDEV@/rules.d
- hwdbdir=@UDEV@/hwdb.d
--udevrules_DATA=@UDEV_RULES@
--hwdb_DATA=69-libmtp.hwdb
--noinst_DATA=libmtp.usermap libmtp.fdi
--
--libmtp.usermap: util/mtp-hotplug
--	util/mtp-hotplug > libmtp.usermap
--
--@UDEV_RULES@: util/mtp-hotplug
--	util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
--
--libmtp.fdi: util/mtp-hotplug
--	util/mtp-hotplug -H > libmtp.fdi
--
--$(hwdb_DATA): util/mtp-hotplug
--	util/mtp-hotplug -w > $(hwdb_DATA)
- 
- CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi libmtp.hwdb
- endif
 diff -Naur a/Makefile.in b/Makefile.in
 --- a/Makefile.in	2016-02-10 12:17:34.000000000 -0800
 +++ b/Makefile.in	2016-04-22 14:14:22.638794537 -0700
@@ -92,23 +70,3 @@ diff -Naur a/Makefile.in b/Makefile.in
  	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
  	install-ps-am install-strip install-udevrulesDATA installcheck \
  	installcheck-am installdirs installdirs-am maintainer-clean \
-@@ -944,19 +931,6 @@
- 
- .PRECIOUS: Makefile
- 
--
--@USE_LINUX_TRUE@libmtp.usermap: util/mtp-hotplug
--@USE_LINUX_TRUE@	util/mtp-hotplug > libmtp.usermap
--
--@USE_LINUX_TRUE@@UDEV_RULES@: util/mtp-hotplug
--@USE_LINUX_TRUE@	util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
--
--@USE_LINUX_TRUE@libmtp.fdi: util/mtp-hotplug
--@USE_LINUX_TRUE@	util/mtp-hotplug -H > libmtp.fdi
--
--@USE_LINUX_TRUE@$(hwdb_DATA): util/mtp-hotplug
--@USE_LINUX_TRUE@	util/mtp-hotplug -w > $(hwdb_DATA)
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: