diff --git a/Jamfile b/Jamfile
index a578e576f3..9a1295ab03 100644
--- a/Jamfile
+++ b/Jamfile
@@ -18,7 +18,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
 
 	regular_image @{
 		bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jpeg less libpng
-		mesa mesa_devel mesa_swrast sed sharutils tar wget which
+		mesa mesa_devel mesa_swrast sed sharutils tar tiff wget which
 	}@
 ] ;
 # secondary architectures
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 4ff6cac548..740dde0374 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -385,6 +385,23 @@ if [ IsPackageAvailable qrencode_devel ] {
 }
 
 
+# tiff
+if [ IsPackageAvailable tiff_devel ] {
+	ExtractBuildFeatureArchives tiff :
+		file: base tiff
+			runtime: lib
+		file: devel tiff_devel
+			depends: base
+			library: $(developLibDir)/libtiff.so.3
+			headers: $(developHeadersDir) $(developHeadersDir)/tiff
+		;
+
+	EnableBuildFeatures tiff ;
+} else {
+	Echo "Tiff support not available on $(TARGET_PACKAGING_ARCH)" ;
+}
+
+
 
 # GPL add-ons
 if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index d24b26e9a6..2123a2f352 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -73,7 +73,6 @@ rule HaikuImageGetSystemLibs
 			libpackage.so
 			libscreensaver.so
 			libtextencoding.so libtracker.so libtranslation.so
-			libtiff.so
 		] ]
 		;
 }
diff --git a/src/add-ons/translators/tiff/Jamfile b/src/add-ons/translators/tiff/Jamfile
index b70ed817b4..6ebc57b2b0 100644
--- a/src/add-ons/translators/tiff/Jamfile
+++ b/src/add-ons/translators/tiff/Jamfile
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src add-ons translators tiff ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UseLibraryHeaders tiff ;
-
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources TIFFTranslator : TIFFTranslator.rdef ;
@@ -11,6 +9,8 @@ AddResources TIFFTranslator : TIFFTranslator.rdef ;
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
+		UseBuildFeatureHeaders tiff ;
+
 		Translator [ MultiArchDefaultGristFiles TIFFTranslator ] :
 			# [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ]
 
@@ -19,11 +19,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			TIFFTranslator.cpp
 			TIFFView.cpp
 
-			: be libtiff.so translation 
+			: be translation 
 			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			[ BuildFeatureAttribute tiff : library ]
 			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+
+		Includes [ FGristFiles TIFFTranslator.cpp TIFFView.cpp ]
+			: [ BuildFeatureAttribute tiff : headers ] ;
 	}
 }
 
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 219f8f13a5..e44d5d9e41 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -167,7 +167,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
index 5e8fc3cd69..5a1075fa9f 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -167,7 +167,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index de6cd279ed..04421c17b2 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -167,7 +167,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 40845b14d8..31398615b0 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -167,7 +167,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index da73424050..77b4b6a67b 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -166,7 +166,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index 3c299b7051..4e46ff3344 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -167,7 +167,6 @@ provides {
 	cmd:zipsplit
 	cmd:zmore
 	cmd:znew
-	lib:libtiff = 3.9.4 compat >= 3
 }
 
 requires {
diff --git a/src/libs/Jamfile b/src/libs/Jamfile
index b8c745a33c..93ed6e661d 100644
--- a/src/libs/Jamfile
+++ b/src/libs/Jamfile
@@ -21,7 +21,6 @@ SubInclude HAIKU_TOP src libs posix_error_mapper ;
 SubInclude HAIKU_TOP src libs print ;
 SubInclude HAIKU_TOP src libs stdc++ ;
 SubInclude HAIKU_TOP src libs termcap ;
-SubInclude HAIKU_TOP src libs tiff ;
 SubInclude HAIKU_TOP src libs udis86 ;
 SubInclude HAIKU_TOP src libs util ;