diff --git a/media-libs/tiff/patches/tiff-3.9.7.patchset b/media-libs/tiff/patches/tiff-3.9.7.patchset
deleted file mode 100644
index dfaa6a262..000000000
--- a/media-libs/tiff/patches/tiff-3.9.7.patchset
+++ /dev/null
@@ -1,128 +0,0 @@
-From a82320c3f0bf541c6c400cbaafda7a5f50b6ba12 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 2 Jun 2014 20:07:15 +0000
-Subject: checks for uint32, uint16, uint8 and uses SupportsDefs.h
-
-
-diff --git a/configure.ac b/configure.ac
-index e7cf804..90e782c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -154,11 +154,14 @@ AC_CHECK_SIZEOF(long)
- AC_HEADER_TIME
- AC_STRUCT_TM
- dnl Some compilers (IBM VisualAge) has these types defined, so check it here:
--AC_CHECK_TYPES([int8, int16, int32],,,
-+AC_CHECK_TYPES([int8, int16, int32, uint8, uint16, uint32],,,
- [
- #if HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
-+#ifdef __HAIKU__
-+# include <SupportDefs.h>
-+#endif
- ])
- 
- # Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG
-diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in
-index 95db77a..41a5772 100644
---- a/libtiff/tif_config.h.in
-+++ b/libtiff/tif_config.h.in
-@@ -142,6 +142,15 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
- 
-+/* Define to 1 if the system has the type `uint16'. */
-+#undef HAVE_UINT16
-+
-+/* Define to 1 if the system has the type `uint32'. */
-+#undef HAVE_UINT32
-+
-+/* Define to 1 if the system has the type `uint8'. */
-+#undef HAVE_UINT8
-+
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-diff --git a/libtiff/tiff.h b/libtiff/tiff.h
-index 0d4ab9f..c70f214 100644
---- a/libtiff/tiff.h
-+++ b/libtiff/tiff.h
-@@ -28,6 +28,10 @@
- #define	_TIFF_
- 
- #include "tiffconf.h"
-+#ifdef __HAIKU__
-+ #include <SupportDefs.h>
-+ // needed for uint* types, avoid massive changes in libtiff
-+#endif
- 
- /*
-  * Tag Image File Format (TIFF)
-@@ -64,22 +68,30 @@
- #ifndef HAVE_INT8
- typedef	signed char int8;	/* NB: non-ANSI compilers may not grok */
- #endif
-+#ifndef HAVE_UINT8
- typedef	unsigned char uint8;
-+#endif
- #ifndef HAVE_INT16
- typedef	short int16;
- #endif
-+#ifndef HAVE_UINT16
- typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
-+#endif
- #if SIZEOF_INT == 4
- #ifndef HAVE_INT32
- typedef	int int32;
- #endif
-+#ifndef HAVE_UINT32
- typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
-+#endif
- #elif SIZEOF_LONG == 4
- #ifndef HAVE_INT32
- typedef	long int32;
- #endif
-+#ifndef HAVE_UINT32
- typedef	unsigned long uint32;	/* sizeof (uint32) must == 4 */
- #endif
-+#endif
- 
- /* For TIFFReassignTagToIgnore */
- enum TIFFIgnoreSense /* IGNORE tag table */
-diff --git a/libtiff/tiffconf.h.in b/libtiff/tiffconf.h.in
-index 1a52b37..3cdcc28 100644
---- a/libtiff/tiffconf.h.in
-+++ b/libtiff/tiffconf.h.in
-@@ -16,6 +16,15 @@
- /* Define to 1 if the system has the type `int8'. */
- #undef HAVE_INT8
- 
-+/* Define to 1 if the system has the type `uint16'. */
-+#undef HAVE_UINT16
-+
-+/* Define to 1 if the system has the type `uint32'. */
-+#undef HAVE_UINT32
-+
-+/* Define to 1 if the system has the type `uint8'. */
-+#undef HAVE_UINT8
-+
- /* The size of a `int', as computed by sizeof. */
- #undef SIZEOF_INT
- 
-diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
-index 2ecc994..fa5fb1c 100644
---- a/libtiff/tiffiop.h
-+++ b/libtiff/tiffiop.h
-@@ -62,7 +62,7 @@ extern void *lfind(const void *, const void *, size_t *, size_t,
-   utilities may use it.  
- */
- 
--#if !defined(__xlC__) && !defined(__xlc__) // Already defined there (#2301)
-+#if !defined(__xlC__) && !defined(__xlc__) && !defined(__HAIKU__) // Already defined there (#2301)
- typedef TIFF_INT64_T  int64;
- typedef TIFF_UINT64_T uint64;
- #endif
--- 
-1.8.3.4
-
diff --git a/media-libs/tiff/tiff-3.9.7.recipe b/media-libs/tiff/tiff-3.9.7.recipe
deleted file mode 100644
index 61ccc9d21..000000000
--- a/media-libs/tiff/tiff-3.9.7.recipe
+++ /dev/null
@@ -1,161 +0,0 @@
-SUMMARY="A library to read/write TIFF images"
-DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for \
-storing image data. Included in this software is a library, libtiff, for \
-reading and writing TIFF and a small collection of tools for doing simple \
-manipulations of TIFF images."
-HOMEPAGE="http://www.libtiff.org/"
-COPYRIGHT="1988-1997 Sam Leffler
-	1991-1997 Silicon Graphics, Inc."
-LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="http://download.osgeo.org/libtiff/tiff-$portVersion.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz"
-CHECKSUM_SHA256="f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a"
-PATCHES="tiff-$portVersion.patchset"
-
-patchesBaseUri="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/tiff/files"
-SOURCE_FILENAME_2="tiff-$portVersion-CVE-2012-4447.patch"
-SOURCE_FILENAME_3="tiff-$portVersion-CVE-2012-4564.patch"
-SOURCE_FILENAME_4="tiff-$portVersion-CVE-2012-5581.patch"
-SOURCE_FILENAME_5="tiff-$portVersion-tiffinfo-exif.patch"
-SOURCE_FILENAME_6="tiff-$portVersion-printdir-width.patch"
-srcGitRev_2="b280d8459134b9f05fcc1525a2aa2d4134091cf4"
-srcGitRev_3="62108c88946351318c1985e167d5c04d8fdd6645"
-srcGitRev_4="05f9e0b614456fc348168a9f9f8c739660c8fefa"
-srcGitRev_5="05f9e0b614456fc348168a9f9f8c739660c8fefa"
-srcGitRev_6="4d119880422822032a408ee1201c20dddde1357c"
-SOURCE_URI_2="$patchesBaseUri/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
-SOURCE_URI_3="$patchesBaseUri/$SOURCE_FILENAME_3?id=$srcGitRev_3#noarchive"
-SOURCE_URI_4="$patchesBaseUri/$SOURCE_FILENAME_4?id=$srcGitRev_4#noarchive"
-SOURCE_URI_5="$patchesBaseUri/$SOURCE_FILENAME_5?id=$srcGitRev_5#noarchive"
-SOURCE_URI_6="$patchesBaseUri/$SOURCE_FILENAME_6?id=$srcGitRev_6#noarchive"
-CHECKSUM_SHA256_2="373020d6c383778ee40f642d90e5d9f3a878f0c17a529825e43e1647d27332cf"
-CHECKSUM_SHA256_3="525f667e2148229520b50d6136c0ecd345b8db9acc62fde945a5f13dae4d51f3"
-CHECKSUM_SHA256_4="f47b30c8fc0578df7285f6cf318f29d410db4b82550b3fbc9582beeb9a834415"
-CHECKSUM_SHA256_5="2b333f3161f88aef3f764de316c4e8f10906932d33ee575b98f7723b2bff1db7"
-CHECKSUM_SHA256_6="597406f727b26fd06106e1e22a1e4e4620b3ffa54a49c2c4b0b8ee6b1d54908b"
-
-ARCHITECTURES="?all"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
-
-PROVIDES="
-	tiff$secondaryArchSuffix = $portVersion compat >= 3
-	lib:libtiff$secondaryArchSuffix = $portVersion compat >= 3
-	lib:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 3
-	devel:libtiff$secondaryArchSuffix = $portVersion compat >= 3
-	devel:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	tiff$secondaryArchSuffix == $portVersion base
-	"
-
-if [ -z "$secondaryArchSuffix" ]; then
-	SUMMARY_tools="The TIFF tools"
-	PROVIDES_tools="
-		tiff_tools = $portVersion compat >= 3
-		cmd:bmp2tiff = $portVersion compat >= 3
-		cmd:fax2ps = $portVersion compat >= 3
-		cmd:fax2tiff = $portVersion compat >= 3
-		cmd:gif2tiff = $portVersion compat >= 3
-		cmd:pal2rgb = $portVersion compat >= 3
-		cmd:ppm2tiff = $portVersion compat >= 3
-		cmd:ras2tiff = $portVersion compat >= 3
-		cmd:raw2tiff = $portVersion compat >= 3
-		cmd:rgb2ycbcr = $portVersion compat >= 3
-		cmd:thumbnail = $portVersion compat >= 3
-		cmd:tiff2bw = $portVersion compat >= 3
-		cmd:tiff2pdf = $portVersion compat >= 3
-		cmd:tiff2ps = $portVersion compat >= 3
-		cmd:tiff2rgba = $portVersion compat >= 3
-		cmd:tiffcmp = $portVersion compat >= 3
-		cmd:tiffcp = $portVersion compat >= 3
-		cmd:tiffcrop = $portVersion compat >= 3
-		cmd:tiffdither = $portVersion compat >= 3
-		cmd:tiffdump = $portVersion compat >= 3
-		cmd:tiffinfo = $portVersion compat >= 3
-		cmd:tiffmedian = $portVersion compat >= 3
-		cmd:tiffset = $portVersion compat >= 3
-		cmd:tiffsplit = $portVersion compat >= 3
-		"
-	REQUIRES_tools="
-		haiku
-		lib:libjpeg
-		lib:libz
-		tiff == $portVersion base
-		"
-fi
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libjpeg$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-PATCH()
-{
-	patch -p1 -i $sourceDir2/$SOURCE_FILENAME_2
-	patch -p1 -i $sourceDir3/$SOURCE_FILENAME_3
-	patch -p1 -i $sourceDir4/$SOURCE_FILENAME_4
-	patch -p1 -i $sourceDir5/$SOURCE_FILENAME_5
-	patch -p1 -i $sourceDir6/$SOURCE_FILENAME_6
-}
-
-BUILD()
-{
-	aclocal
-	libtoolize --force --copy --install
-	automake --add-missing
-	autoconf
-	autoheader
-	runConfigure ./configure --with-docdir=$documentationDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	rm $libDir/libtiff*.la
-
-	prepareInstalledDevelLibs libtiff libtiffxx
-
-	# devel package
-	packageEntries devel \
-		$developDir
-
-	# tools package
-	if [ -z "$secondaryArchSuffix" ]; then
-		packageEntries tools \
-			$binDir \
-			$documentationDir
-	fi
-
-	# Remove stuff we don't need in the secondary architecture base package.
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $binDir
-		rm -rf $documentationDir
-	fi
-}
-
-TEST()
-{
-	make check
-}
diff --git a/media-libs/tiff/tiff-4.6.0.recipe b/media-libs/tiff/tiff-4.6.0.recipe
new file mode 100644
index 000000000..03a908cb7
--- /dev/null
+++ b/media-libs/tiff/tiff-4.6.0.recipe
@@ -0,0 +1,130 @@
+SUMMARY="A library to read/write TIFF images"
+DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for \
+storing image data. Included in this software is a library, libtiff, for \
+reading and writing TIFF and a small collection of tools for doing simple \
+manipulations of TIFF images."
+HOMEPAGE="http://www.libtiff.org/"
+COPYRIGHT="1988-1997 Sam Leffler
+	1991-1997 Silicon Graphics, Inc."
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://download.osgeo.org/libtiff/tiff-$portVersion.tar.gz"
+CHECKSUM_SHA256="88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="6.0.2"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
+
+PROVIDES="
+	tiff$secondaryArchSuffix = $portVersionCompat
+	lib:libtiff$secondaryArchSuffix = $libVersionCompat
+	lib:libtiffxx$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	tiff${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libtiff$secondaryArchSuffix = $libVersionCompat
+	devel:libtiffxx$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	tiff$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	tiff4${secondaryArchSuffix}_devel
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The TIFF tools"
+	PROVIDES_tools="
+		tiff_tools = $portVersion
+		cmd:tiffcp
+		cmd:tiffdump
+		cmd:tiffinfo
+		cmd:tiffset
+		cmd:tiffsplit
+		"
+	REQUIRES_tools="
+		haiku
+		tiff == $portVersion base
+		lib:libjpeg
+		lib:libz
+		"
+	CONFLICTS_tools="
+		tiff4_tools
+		"
+fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libjpeg$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	"
+
+debugList=(
+	"$libDir"/libtiff.so.$libVersion
+	"$libDir"/libtiffxx.so.$libVersion
+	)
+if [ -z "$secondaryArchSuffix" ]; then
+	for i in `echo "$PROVIDES_tools" | sed -n -e "s/^\s*cmd://p"`; do
+		debugList+=("${binDir/$portName/${portName}_tools}"/$i)
+	done
+fi
+defineDebugInfoPackage $portName "${debugList[@]}"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure --with-docdir=$developDocDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# remove static library
+	rm -f $libDir/libtiff*.*a
+
+	prepareInstalledDevelLibs libtiff libtiffxx
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$manDir/man3
+
+	# tools package
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	make check
+}