diff --git a/common/shlibs b/common/shlibs
index ec43690fa7b..5fed1f6790e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -286,7 +286,8 @@ libxcb-keysyms.so.1		xcb-util		xcb-util-devel
 libxcb-property.so.1		xcb-util		xcb-util-devel
 libxcb-atom.so.1		xcb-util		xcb-util-devel
 libxcb-event.so.1		xcb-util		xcb-util-devel
-libtiff.so.3			tiff			tiff-devel
+libtiff.so.5			tiff			tiff-devel
+libtiffxx.so.5			tiff			tiff-devel
 libnotify.so.4			libnotify		libnotify-devel
 libexo-1.so.0			exo			exo-devel
 libvte.so.9			vte			vte-devel
diff --git a/srcpkgs/ImageMagick/libmagick.rshlibs b/srcpkgs/ImageMagick/libmagick.rshlibs
index 0fe996adf68..ed0bc092452 100644
--- a/srcpkgs/ImageMagick/libmagick.rshlibs
+++ b/srcpkgs/ImageMagick/libmagick.rshlibs
@@ -1,5 +1,4 @@
 liblcms2.so.2
-libtiff.so.3
 libfreetype.so.6
 libjpeg.so.8
 libfftw3.so.3
@@ -35,3 +34,4 @@ libstdc++.so.6
 libgcc_s.so.1
 libpangoft2-1.0.so.0
 libpango-1.0.so.0
+libtiff.so.5
diff --git a/srcpkgs/ImageMagick/libmagick.template b/srcpkgs/ImageMagick/libmagick.template
index b14d6880e65..ae02269e00d 100644
--- a/srcpkgs/ImageMagick/libmagick.template
+++ b/srcpkgs/ImageMagick/libmagick.template
@@ -1,5 +1,6 @@
 # Template file for 'libmagick'.
 #
+revision=1
 short_desc="ImageMagick low-level image manipulation libraries"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/djvulibre/djvulibre.rshlibs b/srcpkgs/djvulibre/djvulibre.rshlibs
index a368f08dfe7..18c6df65e89 100644
--- a/srcpkgs/djvulibre/djvulibre.rshlibs
+++ b/srcpkgs/djvulibre/djvulibre.rshlibs
@@ -2,6 +2,6 @@ libdjvulibre.so.21
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libtiff.so.3
 libm.so.6
 libpthread.so.0
+libtiff.so.5
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 29229d1f8bc..d516510c1f0 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -5,7 +5,7 @@ homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-desktopfiles"
-revision=1
+revision=2
 short_desc="Utilities for the DjVu image format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/evince/evince.rshlibs b/srcpkgs/evince/evince.rshlibs
index 11912717cf3..f3e1a2f6225 100644
--- a/srcpkgs/evince/evince.rshlibs
+++ b/srcpkgs/evince/evince.rshlibs
@@ -27,11 +27,9 @@ libgcc_s.so.1
 libdjvulibre.so.21
 libpthread.so.0
 libnautilus-extension.so.1
-libSM.so.6
-libICE.so.6
 libevview3.so.3
 libX11.so.6
 libgnome-keyring.so.0
 libgxps.so.2
 libarchive.so.12
-libtiff.so.3
+libtiff.so.5
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 9a177b86839..6e0c2897f08 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
 --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
 --disable-tests --disable-static"
-revision=4
+revision=5
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
index a88d490de0b..b2d4ad8e50f 100644
--- a/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
@@ -8,5 +8,5 @@ libm.so.6
 libgobject-2.0.so.0
 libgthread-2.0.so.0
 librt.so.1
-libtiff.so.3
 libjpeg.so.8
+libtiff.so.5
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 5574246c6ae..31d0ea0977e 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -4,6 +4,7 @@ version=2.24.1
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png"
+revision=1
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
diff --git a/srcpkgs/gimp/gimp.rshlibs b/srcpkgs/gimp/gimp.rshlibs
index e0a1c4b0058..3c210920a14 100644
--- a/srcpkgs/gimp/gimp.rshlibs
+++ b/srcpkgs/gimp/gimp.rshlibs
@@ -35,7 +35,6 @@ libmng.so.1
 libpoppler-glib.so.8
 libz.so.1
 librsvg-2.so.2
-libtiff.so.3
 libwmf-0.2.so.7
 libwmflite-0.2.so.7
 libXpm.so.4
@@ -44,3 +43,4 @@ libXfixes.so.3
 libjasper.so.1
 libXcursor.so.1
 libgudev-1.0.so.0
+libtiff.so.5
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 064e1889de7..d3f505f37a7 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -5,6 +5,7 @@ distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-aa --without-gvfs --without-gnomevfs
 --enable-gimp-remote --without-hal"
+revision=1
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6c0690d5c4e58423308169a2419b684d05e06bd346cded9e081be470a5f93710
diff --git a/srcpkgs/imlib2/imlib2.rshlibs b/srcpkgs/imlib2/imlib2.rshlibs
index 5c827917f67..d39ebf6dbc4 100644
--- a/srcpkgs/imlib2/imlib2.rshlibs
+++ b/srcpkgs/imlib2/imlib2.rshlibs
@@ -8,6 +8,6 @@ libm.so.6
 libc.so.6
 libjpeg.so.8
 libpng14.so.14
-libtiff.so.3
 libgif.so.4
 libid3tag.so.0
+libtiff.so.5
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 899c2b7a6a4..b2f6923a9eb 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,7 +1,7 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
 version=1.4.2
-revision=3
+revision=4
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding"
diff --git a/srcpkgs/lcms/lcms.rshlibs b/srcpkgs/lcms/lcms.rshlibs
index 87caeb1be7b..f88444be972 100644
--- a/srcpkgs/lcms/lcms.rshlibs
+++ b/srcpkgs/lcms/lcms.rshlibs
@@ -1,4 +1,4 @@
 libm.so.6
 libc.so.6
-libtiff.so.3
 libjpeg.so.8
+libtiff.so.5
diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template
index 3043834262d..a5ba2ae3024 100644
--- a/srcpkgs/lcms/template
+++ b/srcpkgs/lcms/template
@@ -1,7 +1,7 @@
 # Template build file for 'lcms'.
 pkgname=lcms
 version=1.19
-revision=4
+revision=5
 wrksrc=${pkgname}-${version%[a-z]*}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
diff --git a/srcpkgs/lcms2/lcms2.rshlibs b/srcpkgs/lcms2/lcms2.rshlibs
index 2a1b9451cb8..7b37d795287 100644
--- a/srcpkgs/lcms2/lcms2.rshlibs
+++ b/srcpkgs/lcms2/lcms2.rshlibs
@@ -1,4 +1,4 @@
 libc.so.6
 libjpeg.so.8
-libtiff.so.3
 libm.so.6
+libtiff.so.5
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index d0f7f5730c4..8b0fce127d3 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -3,7 +3,7 @@ pkgname=lcms2
 version=2.2
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz"
 build_style=gnu-configure
-revision=1
+revision=2
 short_desc="Small-footprint color management engine, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.littlecms.com"
diff --git a/srcpkgs/libgxps/libgxps.rshlibs b/srcpkgs/libgxps/libgxps.rshlibs
index 13d3434011e..7fc2373dc8a 100644
--- a/srcpkgs/libgxps/libgxps.rshlibs
+++ b/srcpkgs/libgxps/libgxps.rshlibs
@@ -7,10 +7,10 @@ libglib-2.0.so.0
 libcairo.so.2
 libfreetype.so.6
 libjpeg.so.8
-libtiff.so.3
 libpthread.so.0
 libc.so.6
 liblcms2.so.2
 libpng14.so.14
 libm.so.6
 libarchive.so.12
+libtiff.so.5
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index e857287d1a3..5f2ea1b9318 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -5,7 +5,7 @@ homepage="http://live.gnome.org/libgxps"
 distfiles="${GNOME_SITE}/$pkgname/0.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
-revision=1
+revision=2
 short_desc="GObject base library for XPS documents"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
diff --git a/srcpkgs/poppler/poppler-cpp.rshlibs b/srcpkgs/poppler/poppler-cpp.rshlibs
index 2b4bef3c31f..0fe8fd69e3a 100644
--- a/srcpkgs/poppler/poppler-cpp.rshlibs
+++ b/srcpkgs/poppler/poppler-cpp.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -11,3 +10,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template
index c0c35b04357..e4695089e42 100644
--- a/srcpkgs/poppler/poppler-cpp.template
+++ b/srcpkgs/poppler/poppler-cpp.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-cpp'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (C++ bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler-glib.rshlibs b/srcpkgs/poppler/poppler-glib.rshlibs
index bccaa3145ad..701a1fea29a 100644
--- a/srcpkgs/poppler/poppler-glib.rshlibs
+++ b/srcpkgs/poppler/poppler-glib.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -16,3 +15,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template
index 20eb25c2b1c..119e387a5f0 100644
--- a/srcpkgs/poppler/poppler-glib.template
+++ b/srcpkgs/poppler/poppler-glib.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-glib'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (GLib bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler-qt4.rshlibs b/srcpkgs/poppler/poppler-qt4.rshlibs
index 9c1b6a3dc89..bac4fefb3c6 100644
--- a/srcpkgs/poppler/poppler-qt4.rshlibs
+++ b/srcpkgs/poppler/poppler-qt4.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -14,3 +13,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template
index b9244564a85..a941a890c7c 100644
--- a/srcpkgs/poppler/poppler-qt4.template
+++ b/srcpkgs/poppler/poppler-qt4.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-qt4'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (QT bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler.rshlibs b/srcpkgs/poppler/poppler.rshlibs
index 3b2eda01920..2d9198983a1 100644
--- a/srcpkgs/poppler/poppler.rshlibs
+++ b/srcpkgs/poppler/poppler.rshlibs
@@ -1,5 +1,4 @@
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -10,3 +9,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 984dd49079f..d4476dbaedb 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -6,7 +6,7 @@ distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
 --enable-libtiff --disable-libopenjpeg"
-revision=2
+revision=3
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/qt/qt.rshlibs b/srcpkgs/qt/qt.rshlibs
index 7beb424b405..6e9785f8c94 100644
--- a/srcpkgs/qt/qt.rshlibs
+++ b/srcpkgs/qt/qt.rshlibs
@@ -25,7 +25,6 @@ libOpenVG.so.1
 libasound.so.2
 libsqlite3.so.0
 libmng.so.1
-libtiff.so.3
 libjpeg.so.8
 ld-linux-x86-64.so.2
 libgstapp-0.10.so.0
@@ -37,3 +36,4 @@ libgstreamer-0.10.so.0
 libpulse-mainloop-glib.so.0
 libpulse.so.0
 libgstaudio-0.10.so.0
+libtiff.so.5
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 0071b0f2b24..a4478189161 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -5,6 +5,7 @@ _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
+revision=1
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-2.1"
diff --git a/srcpkgs/tiff/depends b/srcpkgs/tiff/depends
index 32e97d91eb4..487aa86df2c 100644
--- a/srcpkgs/tiff/depends
+++ b/srcpkgs/tiff/depends
@@ -1,2 +1,2 @@
-abi_depends=">=3.8.2"
+abi_depends=">=4.0.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index d5f1a59e353..11e0f150624 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,13 +1,12 @@
 # Template build file for 'tiff'.
 pkgname=tiff
-version=3.9.3
+version=4.0.0
 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
-revision=1
 short_desc="Library and tools for reading and writing TIFF data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=60e08794966b7cbf46bbf13c347f1fe41c982f98714909f49d6f198add4fdee6
+checksum=9f4c0b2a8446a259db431c6401342bcb2c1be4a604e77a532d109c8448619288
 long_desc="
  This is software provides support for the Tag Image Format (TIFF).
  Included is a library, libtiff, for reading and writing TIFF, a
@@ -23,3 +22,4 @@ long_desc="
 subpackages="$pkgname-devel"
 Add_dependency build zlib-devel
 Add_dependency build jpeg-devel
+Add_dependency build liblzma-devel
diff --git a/srcpkgs/tiff/tiff.rshlibs b/srcpkgs/tiff/tiff.rshlibs
index d322904685e..959dc043cd5 100644
--- a/srcpkgs/tiff/tiff.rshlibs
+++ b/srcpkgs/tiff/tiff.rshlibs
@@ -4,3 +4,4 @@ libjpeg.so.8
 libz.so.1
 libstdc++.so.6
 libgcc_s.so.1
+liblzma.so.5
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 7152c3d5f9b..e765f04aaf4 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests
 --enable-libtiff --disable-static"
 short_desc="Personal search tool and storage system"
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 checksum=ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c
diff --git a/srcpkgs/tracker/tracker.rshlibs b/srcpkgs/tracker/tracker.rshlibs
index de965eb2ce8..7e8ed5ccca2 100644
--- a/srcpkgs/tracker/tracker.rshlibs
+++ b/srcpkgs/tracker/tracker.rshlibs
@@ -19,7 +19,6 @@ libogg.so.0
 libFLAC.so.8
 libgif.so.4
 libjpeg.so.8
-libtiff.so.3
 libxml2.so.2
 libgsf-1.so.114
 libpoppler-glib.so.8
@@ -47,3 +46,4 @@ libupower-glib.so.1
 librest-0.7.so.0
 libpanel-applet-4.so.0
 libgee.so.2
+libtiff.so.5
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index 6d152a494c9..2f56b3c66fe 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -1,7 +1,7 @@
 # Template file for 'xbmc'
 pkgname=xbmc
 version=10.1
-revision=9
+revision=10
 patch_args="-Np1"
 distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
 short_desc="XBMC Media Center"
diff --git a/srcpkgs/xbmc/xbmc.rshlibs b/srcpkgs/xbmc/xbmc.rshlibs
index 6b15e2bc745..1bdebc49574 100644
--- a/srcpkgs/xbmc/xbmc.rshlibs
+++ b/srcpkgs/xbmc/xbmc.rshlibs
@@ -42,7 +42,7 @@ ld-linux-x86-64.so.2
 libexpat.so.1
 libpng14.so.14
 libjpeg.so.8
-libtiff.so.3
+libtiff.so.5
 libXmu.so.6
 libcdio.so.13
 libXrender.so.1