diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 00094d96efa..a425f2f9232 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,16 +1,18 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=0.14.1
-homepage="http://live.gnome.org/Tracker"
-distfiles="${GNOME_SITE}/$pkgname/0.14/$pkgname-$version.tar.xz"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests
 --enable-libtiff --disable-static --enable-network-manager"
-makedepends="pkg-config intltool gobject-introspection libgee-devel libgnome-keyring-devel upower-devel exempi-devel poppler-glib-devel libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel nautilus-devel gnome-panel-devel taglib-devel giflib-devel totem-pl-parser-devel gupnp-dlna-devel libexif-devel tiff-devel network-manager-applet-devel"
-revision=1
+makedepends="pkg-config intltool gobject-introspection libpng-devel>=1.5.10 libgee-devel libgnome-keyring-devel upower-devel exempi-devel poppler-glib-devel libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel nautilus-devel gnome-panel-devel taglib-devel giflib-devel totem-pl-parser-devel gupnp-dlna-devel libexif-devel tiff-devel network-manager-applet-devel sqlite-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="$pkgname-devel libtracker"
 short_desc="Personal search tool and storage system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://live.gnome.org/Tracker"
+distfiles="${GNOME_SITE}/$pkgname/0.14/$pkgname-$version.tar.xz"
 checksum=17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43
 long_desc="
  Tracker trawls through your data and organises it so that it can be retrieved
@@ -20,7 +22,3 @@ long_desc="
  your data with keywords which can be used to find related information or to
  group and categorise your data further. Tracker lets you extend your data
  with additional metadata."
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel libtracker"
-
diff --git a/srcpkgs/tracker/tracker-devel.template b/srcpkgs/tracker/tracker-devel.template
index 07e298fe4c4..503349303e4 100644
--- a/srcpkgs/tracker/tracker-devel.template
+++ b/srcpkgs/tracker/tracker-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'tracker-devel'.
 #
-depends="glib-devel libtracker"
+noarch=yes
+depends="glib-devel libtracker>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/share/gir-1.0 usr/share
 	vmove usr/share/gtk-doc usr/share
diff --git a/srcpkgs/tracker/tracker.rshlibs b/srcpkgs/tracker/tracker.rshlibs
index 3af2fe0e893..9632dccd7ca 100644
--- a/srcpkgs/tracker/tracker.rshlibs
+++ b/srcpkgs/tracker/tracker.rshlibs
@@ -9,7 +9,6 @@ librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libpng14.so.14
 libvorbisfile.so.3
 libvorbis.so.0
 libm.so.6
@@ -42,3 +41,4 @@ libtracker-sparql-0.14.so.0
 libtracker-miner-0.14.so.0
 libgee.so.2
 libpanel-applet-4.so.0
+libpng15.so.15