diff --git a/src/add-ons/translators/Jamfile b/src/add-ons/translators/Jamfile
index 8881d577fe..e2a6ee561b 100644
--- a/src/add-ons/translators/Jamfile
+++ b/src/add-ons/translators/Jamfile
@@ -7,7 +7,6 @@ SubInclude HAIKU_TOP src add-ons translators hpgs ;
 SubInclude HAIKU_TOP src add-ons translators ico ;
 SubInclude HAIKU_TOP src add-ons translators jpeg ;
 SubInclude HAIKU_TOP src add-ons translators jpeg2000 ;
-SubInclude HAIKU_TOP src add-ons translators libtiff ;
 SubInclude HAIKU_TOP src add-ons translators pcx ;
 SubInclude HAIKU_TOP src add-ons translators png ;
 SubInclude HAIKU_TOP src add-ons translators ppm ;
@@ -16,4 +15,5 @@ SubInclude HAIKU_TOP src add-ons translators rtf ;
 SubInclude HAIKU_TOP src add-ons translators sgi ;
 SubInclude HAIKU_TOP src add-ons translators stxt ;
 SubInclude HAIKU_TOP src add-ons translators tga ;
+SubInclude HAIKU_TOP src add-ons translators tiff ;
 SubInclude HAIKU_TOP src add-ons translators wonderbrush ;
diff --git a/src/add-ons/translators/libtiff/Jamfile b/src/add-ons/translators/tiff/Jamfile
similarity index 95%
rename from src/add-ons/translators/libtiff/Jamfile
rename to src/add-ons/translators/tiff/Jamfile
index 15e896d991..2754d35dd1 100644
--- a/src/add-ons/translators/libtiff/Jamfile
+++ b/src/add-ons/translators/tiff/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons translators libtiff ;
+SubDir HAIKU_TOP src add-ons translators tiff ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/add-ons/translators/libtiff/TIFFMain.cpp b/src/add-ons/translators/tiff/TIFFMain.cpp
similarity index 100%
rename from src/add-ons/translators/libtiff/TIFFMain.cpp
rename to src/add-ons/translators/tiff/TIFFMain.cpp
diff --git a/src/add-ons/translators/libtiff/TIFFTranslator.cpp b/src/add-ons/translators/tiff/TIFFTranslator.cpp
similarity index 100%
rename from src/add-ons/translators/libtiff/TIFFTranslator.cpp
rename to src/add-ons/translators/tiff/TIFFTranslator.cpp
diff --git a/src/add-ons/translators/libtiff/TIFFTranslator.h b/src/add-ons/translators/tiff/TIFFTranslator.h
similarity index 100%
rename from src/add-ons/translators/libtiff/TIFFTranslator.h
rename to src/add-ons/translators/tiff/TIFFTranslator.h
diff --git a/src/add-ons/translators/libtiff/TIFFView.cpp b/src/add-ons/translators/tiff/TIFFView.cpp
similarity index 100%
rename from src/add-ons/translators/libtiff/TIFFView.cpp
rename to src/add-ons/translators/tiff/TIFFView.cpp
diff --git a/src/add-ons/translators/libtiff/TIFFView.h b/src/add-ons/translators/tiff/TIFFView.h
similarity index 100%
rename from src/add-ons/translators/libtiff/TIFFView.h
rename to src/add-ons/translators/tiff/TIFFView.h
diff --git a/src/add-ons/translators/libtiff/t4.h b/src/add-ons/translators/tiff/t4.h
similarity index 100%
rename from src/add-ons/translators/libtiff/t4.h
rename to src/add-ons/translators/tiff/t4.h
diff --git a/src/add-ons/translators/libtiff/tif_aux.c b/src/add-ons/translators/tiff/tif_aux.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_aux.c
rename to src/add-ons/translators/tiff/tif_aux.c
diff --git a/src/add-ons/translators/libtiff/tif_close.c b/src/add-ons/translators/tiff/tif_close.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_close.c
rename to src/add-ons/translators/tiff/tif_close.c
diff --git a/src/add-ons/translators/libtiff/tif_codec.c b/src/add-ons/translators/tiff/tif_codec.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_codec.c
rename to src/add-ons/translators/tiff/tif_codec.c
diff --git a/src/add-ons/translators/libtiff/tif_color.c b/src/add-ons/translators/tiff/tif_color.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_color.c
rename to src/add-ons/translators/tiff/tif_color.c
diff --git a/src/add-ons/translators/libtiff/tif_compress.c b/src/add-ons/translators/tiff/tif_compress.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_compress.c
rename to src/add-ons/translators/tiff/tif_compress.c
diff --git a/src/add-ons/translators/libtiff/tif_dir.c b/src/add-ons/translators/tiff/tif_dir.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dir.c
rename to src/add-ons/translators/tiff/tif_dir.c
diff --git a/src/add-ons/translators/libtiff/tif_dir.h b/src/add-ons/translators/tiff/tif_dir.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dir.h
rename to src/add-ons/translators/tiff/tif_dir.h
diff --git a/src/add-ons/translators/libtiff/tif_dirinfo.c b/src/add-ons/translators/tiff/tif_dirinfo.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dirinfo.c
rename to src/add-ons/translators/tiff/tif_dirinfo.c
diff --git a/src/add-ons/translators/libtiff/tif_dirread.c b/src/add-ons/translators/tiff/tif_dirread.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dirread.c
rename to src/add-ons/translators/tiff/tif_dirread.c
diff --git a/src/add-ons/translators/libtiff/tif_dirwrite.c b/src/add-ons/translators/tiff/tif_dirwrite.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dirwrite.c
rename to src/add-ons/translators/tiff/tif_dirwrite.c
diff --git a/src/add-ons/translators/libtiff/tif_dumpmode.c b/src/add-ons/translators/tiff/tif_dumpmode.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_dumpmode.c
rename to src/add-ons/translators/tiff/tif_dumpmode.c
diff --git a/src/add-ons/translators/libtiff/tif_error.c b/src/add-ons/translators/tiff/tif_error.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_error.c
rename to src/add-ons/translators/tiff/tif_error.c
diff --git a/src/add-ons/translators/libtiff/tif_extension.c b/src/add-ons/translators/tiff/tif_extension.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_extension.c
rename to src/add-ons/translators/tiff/tif_extension.c
diff --git a/src/add-ons/translators/libtiff/tif_fax3.c b/src/add-ons/translators/tiff/tif_fax3.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_fax3.c
rename to src/add-ons/translators/tiff/tif_fax3.c
diff --git a/src/add-ons/translators/libtiff/tif_fax3.h b/src/add-ons/translators/tiff/tif_fax3.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_fax3.h
rename to src/add-ons/translators/tiff/tif_fax3.h
diff --git a/src/add-ons/translators/libtiff/tif_fax3sm.c b/src/add-ons/translators/tiff/tif_fax3sm.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_fax3sm.c
rename to src/add-ons/translators/tiff/tif_fax3sm.c
diff --git a/src/add-ons/translators/libtiff/tif_flush.c b/src/add-ons/translators/tiff/tif_flush.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_flush.c
rename to src/add-ons/translators/tiff/tif_flush.c
diff --git a/src/add-ons/translators/libtiff/tif_getimage.c b/src/add-ons/translators/tiff/tif_getimage.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_getimage.c
rename to src/add-ons/translators/tiff/tif_getimage.c
diff --git a/src/add-ons/translators/libtiff/tif_luv.c b/src/add-ons/translators/tiff/tif_luv.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_luv.c
rename to src/add-ons/translators/tiff/tif_luv.c
diff --git a/src/add-ons/translators/libtiff/tif_lzw.c b/src/add-ons/translators/tiff/tif_lzw.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_lzw.c
rename to src/add-ons/translators/tiff/tif_lzw.c
diff --git a/src/add-ons/translators/libtiff/tif_next.c b/src/add-ons/translators/tiff/tif_next.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_next.c
rename to src/add-ons/translators/tiff/tif_next.c
diff --git a/src/add-ons/translators/libtiff/tif_open.c b/src/add-ons/translators/tiff/tif_open.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_open.c
rename to src/add-ons/translators/tiff/tif_open.c
diff --git a/src/add-ons/translators/libtiff/tif_packbits.c b/src/add-ons/translators/tiff/tif_packbits.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_packbits.c
rename to src/add-ons/translators/tiff/tif_packbits.c
diff --git a/src/add-ons/translators/libtiff/tif_predict.c b/src/add-ons/translators/tiff/tif_predict.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_predict.c
rename to src/add-ons/translators/tiff/tif_predict.c
diff --git a/src/add-ons/translators/libtiff/tif_predict.h b/src/add-ons/translators/tiff/tif_predict.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_predict.h
rename to src/add-ons/translators/tiff/tif_predict.h
diff --git a/src/add-ons/translators/libtiff/tif_print.c b/src/add-ons/translators/tiff/tif_print.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_print.c
rename to src/add-ons/translators/tiff/tif_print.c
diff --git a/src/add-ons/translators/libtiff/tif_read.c b/src/add-ons/translators/tiff/tif_read.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_read.c
rename to src/add-ons/translators/tiff/tif_read.c
diff --git a/src/add-ons/translators/libtiff/tif_strip.c b/src/add-ons/translators/tiff/tif_strip.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_strip.c
rename to src/add-ons/translators/tiff/tif_strip.c
diff --git a/src/add-ons/translators/libtiff/tif_swab.c b/src/add-ons/translators/tiff/tif_swab.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_swab.c
rename to src/add-ons/translators/tiff/tif_swab.c
diff --git a/src/add-ons/translators/libtiff/tif_thunder.c b/src/add-ons/translators/tiff/tif_thunder.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_thunder.c
rename to src/add-ons/translators/tiff/tif_thunder.c
diff --git a/src/add-ons/translators/libtiff/tif_tile.c b/src/add-ons/translators/tiff/tif_tile.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_tile.c
rename to src/add-ons/translators/tiff/tif_tile.c
diff --git a/src/add-ons/translators/libtiff/tif_unix.c b/src/add-ons/translators/tiff/tif_unix.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_unix.c
rename to src/add-ons/translators/tiff/tif_unix.c
diff --git a/src/add-ons/translators/libtiff/tif_version.c b/src/add-ons/translators/tiff/tif_version.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_version.c
rename to src/add-ons/translators/tiff/tif_version.c
diff --git a/src/add-ons/translators/libtiff/tif_warning.c b/src/add-ons/translators/tiff/tif_warning.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_warning.c
rename to src/add-ons/translators/tiff/tif_warning.c
diff --git a/src/add-ons/translators/libtiff/tif_write.c b/src/add-ons/translators/tiff/tif_write.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_write.c
rename to src/add-ons/translators/tiff/tif_write.c
diff --git a/src/add-ons/translators/libtiff/tif_zip.c b/src/add-ons/translators/tiff/tif_zip.c
similarity index 100%
rename from src/add-ons/translators/libtiff/tif_zip.c
rename to src/add-ons/translators/tiff/tif_zip.c
diff --git a/src/add-ons/translators/libtiff/tiff.h b/src/add-ons/translators/tiff/tiff.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiff.h
rename to src/add-ons/translators/tiff/tiff.h
diff --git a/src/add-ons/translators/libtiff/tiffcomp.h b/src/add-ons/translators/tiff/tiffcomp.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiffcomp.h
rename to src/add-ons/translators/tiff/tiffcomp.h
diff --git a/src/add-ons/translators/libtiff/tiffconf.h b/src/add-ons/translators/tiff/tiffconf.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiffconf.h
rename to src/add-ons/translators/tiff/tiffconf.h
diff --git a/src/add-ons/translators/libtiff/tiffio.h b/src/add-ons/translators/tiff/tiffio.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiffio.h
rename to src/add-ons/translators/tiff/tiffio.h
diff --git a/src/add-ons/translators/libtiff/tiffiop.h b/src/add-ons/translators/tiff/tiffiop.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiffiop.h
rename to src/add-ons/translators/tiff/tiffiop.h
diff --git a/src/add-ons/translators/libtiff/tiffvers.h b/src/add-ons/translators/tiff/tiffvers.h
similarity index 100%
rename from src/add-ons/translators/libtiff/tiffvers.h
rename to src/add-ons/translators/tiff/tiffvers.h
diff --git a/src/add-ons/translators/libtiff/uvcode.h b/src/add-ons/translators/tiff/uvcode.h
similarity index 100%
rename from src/add-ons/translators/libtiff/uvcode.h
rename to src/add-ons/translators/tiff/uvcode.h