diff --git a/media-libs/libmtp/libmtp-1.1.11.recipe b/media-libs/libmtp/libmtp-1.1.12.recipe
similarity index 52%
rename from media-libs/libmtp/libmtp-1.1.11.recipe
rename to media-libs/libmtp/libmtp-1.1.12.recipe
index c368faba6..0479525f7 100644
--- a/media-libs/libmtp/libmtp-1.1.11.recipe
+++ b/media-libs/libmtp/libmtp-1.1.12.recipe
@@ -1,46 +1,52 @@
 SUMMARY="MTP initiator library"
-DESCRIPTION="libmtp implements an MTP initiator, which means it initiate \
-MTP sessions with devices. The devices responding are known as MTP responders. \
-libmtp runs on something with a USB host controller interface, using libusb \
-to access the host controller."
-HOMEPAGE="http://libmtp.sourceforge.net"
-COPYRIGHT="Richard Low
-	Linus Walleij
-	Mariusz Woloszyn
-	Marcus Meissner"
+DESCRIPTION="libmtp implements an MTP initiator, which means it initiates MTP \
+sessions with devices. The devices responding are known as MTP responders. \
+libmtp runs on something with a USB host controller interface, using libusb to \
+access the host controller."
+HOMEPAGE="http://libmtp.sourceforge.net/"
+COPYRIGHT="2006-2011 Linus Walleij
+	2006-2010 Richard Low
+	2006-2009 Marcus Meissner
+	2006 Mariusz Woloszyn"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="http://prdownloads.sourceforge.net/libmtp/libmtp-$portVersion.tar.gz"
-CHECKSUM_SHA256="15d96dff79a4f7ad14338894a4096d4ac584c6ad25fdcca955bc4726303287e9"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/libmtp/libmtp-$portVersion.tar.gz"
+CHECKSUM_SHA256="cdf59e816c6cda3e908a876c7fb42943f40b85669aea0029a1ca431c89afa1a0"
 PATCHES="libmtp-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandBinDir=$binDir
+else
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	libmtp$secondaryArchSuffix = $portVersion compat >= 1.0
 	lib:libmtp$secondaryArchSuffix = 9.3.0 compat >= 9
-	cmd:mtp_albumart$secondaryArchSuffix
-	cmd:mtp_albums$secondaryArchSuffix
-	cmd:mtp_connect$secondaryArchSuffix
-	cmd:mtp_delfile$secondaryArchSuffix
-	cmd:mtp_detect$secondaryArchSuffix
-	cmd:mtp_emptyfolders$secondaryArchSuffix
-	cmd:mtp_files$secondaryArchSuffix
-	cmd:mtp_filetree$secondaryArchSuffix
-	cmd:mtp_folders$secondaryArchSuffix
-	cmd:mtp_format$secondaryArchSuffix
-	cmd:mtp_getfile$secondaryArchSuffix
-	cmd:mtp_getplaylist$secondaryArchSuffix
-	cmd:mtp_newfolder$secondaryArchSuffix
-	cmd:mtp_newplaylist$secondaryArchSuffix
-	cmd:mtp_playlists$secondaryArchSuffix
-	cmd:mtp_reset$secondaryArchSuffix
-	cmd:mtp_sendfile$secondaryArchSuffix
-	cmd:mtp_sendtr$secondaryArchSuffix
-	cmd:mtp_thumb$secondaryArchSuffix
-	cmd:mtp_tracks$secondaryArchSuffix
-	cmd:mtp_trexist$secondaryArchSuffix
+	cmd:mtp_albumart
+	cmd:mtp_albums
+	cmd:mtp_connect
+	cmd:mtp_delfile
+	cmd:mtp_detect
+	cmd:mtp_emptyfolders
+	cmd:mtp_files
+	cmd:mtp_filetree
+	cmd:mtp_folders
+	cmd:mtp_format
+	cmd:mtp_getfile
+	cmd:mtp_getplaylist
+	cmd:mtp_newfolder
+	cmd:mtp_newplaylist
+	cmd:mtp_playlists
+	cmd:mtp_reset
+	cmd:mtp_sendfile
+	cmd:mtp_sendtr
+	cmd:mtp_thumb
+	cmd:mtp_tracks
+	cmd:mtp_trexist
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -71,20 +77,21 @@ BUILD_PREREQUIRES="
 	cmd:aclocal >= 1.15
 	cmd:autoconf
 	cmd:automake
+#	cmd:doxygen
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:gettext
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:doxygen
-	cmd:find
 	"
 
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure # --enable-doxygen
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
+		# --enable-doxygen
 	make $jobArgs
 }
 
@@ -92,10 +99,17 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libmtp
+	rm $libDir/libmtp.la
+
+	prepareInstalledDevelLib libmtp
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
 		$developDir # $docDir
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-libs/libmtp/patches/libmtp-1.1.11.patchset b/media-libs/libmtp/patches/libmtp-1.1.12.patchset
similarity index 68%
rename from media-libs/libmtp/patches/libmtp-1.1.11.patchset
rename to media-libs/libmtp/patches/libmtp-1.1.12.patchset
index e7c611bae..e436a51d3 100644
--- a/media-libs/libmtp/patches/libmtp-1.1.11.patchset
+++ b/media-libs/libmtp/patches/libmtp-1.1.12.patchset
@@ -1,14 +1,14 @@
-From 42d85dd2edd255726d4a48226d7dafa2dfe964f8 Mon Sep 17 00:00:00 2001
+From 36f3dc0b697879b7242176eb9f95144634112cc2 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 21 May 2014 21:24:57 +0000
 Subject: fix configure.ac
 
 
 diff --git a/configure.ac b/configure.ac
-index 87d7fcc..2063735 100644
+index 600105b..c40c587 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4,7 +4,7 @@ AC_INIT([libmtp], [1.1.6], [libmtp-discuss@lists.sourceforge.net])
+@@ -4,7 +4,7 @@ AC_INIT([libmtp], [1.1.12], [libmtp-discuss@lists.sourceforge.net])
  AC_CONFIG_MACRO_DIR([m4])
  AM_INIT_AUTOMAKE([foreign])
  AC_CONFIG_SRCDIR([src/libmtp.c])