diff --git a/app-admin/testdisk/testdisk-7.1~git.recipe b/app-admin/testdisk/testdisk-7.1~git.recipe
index 03ee21219..f19e12c0a 100644
--- a/app-admin/testdisk/testdisk-7.1~git.recipe
+++ b/app-admin/testdisk/testdisk-7.1~git.recipe
@@ -26,61 +26,72 @@ non-booting drive which can then be sent to a tech for further analysis. \
 Those more familiar with such procedures should find TestDisk a handy \
 tool in performing onsite recovery."
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-COPYRIGHT="1998-2008 Christophe GRENIER"
+COPYRIGHT="1998-2018 Christophe GRENIER"
 LICENSE="GNU GPL v2"
-REVISION="3"
-gitCommit="d0c0bf21ddadd60c7bb2188a66d39039d5cd2f9c"
-SOURCE_URI=" https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-$gitCommit.tar.gz"
-CHECKSUM_SHA256="d2e0d02ca5df40db3d46e705721d36ee875928e57387d7a6919c219757a9dea3"
-SOURCE_DIR="testdisk-$gitCommit"
+REVISION="4"
+srcGitRev="45259e8a1650f77d38864c3b13b93e14ef6fc714"
+SOURCE_URI="https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-$srcGitRev.tar.gz"
+CHECKSUM_SHA256="3cf9740c1721ddeb1839a35f8331ff0ba8fb768c79c25ac3bbc235bfbd9ed92b"
+SOURCE_FILENAME="testdisk-$portVersion-$srcGitRev.tar.gz"
+SOURCE_DIR="testdisk-$srcGitRev"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 #TODO: add SVG icon to qphotorec
 #TODO: require libntfs3g, ext2fs, reiserfs
 
 PROVIDES="
 	testdisk$secondaryArchSuffix = $portVersion
-	cmd:testdisk = $portVersion
-	cmd:photorec = $portVersion
-	cmd:fidentify = $portVersion
+	cmd:testdisk$commandSuffix = $portVersion
+	cmd:photorec$commandSuffix = $portVersion
+	cmd:fidentify$commandSuffix = $portVersion
 	"
 PROVIDES_qt="
 	testdisk${secondaryArchSuffix}_qt = $portVersion
-	cmd:qphotorec = $portVersion
+	cmd:qphotorec$commandSuffix = $portVersion
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
-	lib:libuuid$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix >= 1.3
 	lib:libz$secondaryArchSuffix
 	"
 REQUIRES_qt="
-	testdisk${secondaryArchSuffix} == $portVersion base
+	testdisk$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libuuid$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix >= 1.3
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libuuid$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix >= 1.3
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -96,8 +107,8 @@ BUILD()
 {
 	export CXXFLAGS="-std=c++11"
 	autoreconf -fi
-	runConfigure --omit-dirs "binDir" ./configure \
-		--bindir=$prefix/bin \
+	LIBS="-lintl" \
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
 		--disable-stack-protector
 	make $jobArgs
 }
@@ -118,3 +129,8 @@ INSTALL()
 		$manDir/*/*/qphotorec.* \
 		$dataDir/deskbar/menu/Applications/QPhotoRec
 }
+
+TEST()
+{
+	make check
+}