diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 501fe8c0a6d..31ecbafdfb1 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -37,7 +37,6 @@ Add_dependency run gamin
 Add_dependency run jpeg
 Add_dependency run libpng
 Add_dependency run startup-notification
-Add_dependency run hal
 Add_dependency run libexif
 Add_dependency run pcre
 Add_dependency run xfce4-panel
@@ -65,5 +64,7 @@ Add_dependency build startup-notification-devel
 Add_dependency build libexif-devel
 Add_dependency build pcre-devel
 Add_dependency build xfce4-panel-devel
+Add_dependency build libhal-devel
+Add_dependency full hal
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
diff --git a/srcpkgs/exo/exo-devel.template b/srcpkgs/exo/exo-devel.template
index 88abe5f25e9..871b942c3fe 100644
--- a/srcpkgs/exo/exo-devel.template
+++ b/srcpkgs/exo/exo-devel.template
@@ -5,9 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
 
 Add_dependency run pkg-config
+Add_dependency run glib-devel
 Add_dependency run freetype-devel
 Add_dependency run gtk+-devel
 Add_dependency run libxfce4util-devel
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 1113cff91ef..7178f898780 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,7 +1,7 @@
 # Template file for 'exo'
 pkgname=exo
 version=0.3.105
-revision=1
+revision=2
 distfiles="http://archive.xfce.org/src/xfce/exo/0.3/exo-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-python --enable-xsltproc"
@@ -26,10 +26,8 @@ Add_dependency run pango
 Add_dependency run gtk+
 Add_dependency run libxfce4util
 Add_dependency run libnotify
-Add_dependency full hal
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
-Add_dependency full perl-URI
+Add_dependency run libhal
+
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build libxslt
@@ -38,3 +36,9 @@ Add_dependency build gtk+-devel
 Add_dependency build libxfce4util-devel
 Add_dependency build dbus-devel
 Add_dependency build libnotify-devel
+Add_dependency build libhal-devel
+
+Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
+Add_dependency full perl-URI
+Add_dependency full hal
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 99718a78092..e12fcd76219 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,7 +1,7 @@
 # Template file for 'thunar-volman'.
 pkgname=thunar-volman
 version=0.3.80
-revision=1
+revision=2
 distfiles="http://goodies.xfce.org/releases/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Thunar Volume Manager"
@@ -20,7 +20,6 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 Add_dependency run glibc
 Add_dependency run dbus-glib
 Add_dependency run exo
-Add_dependency run hal
 Add_dependency run dbus-libs
 Add_dependency run Thunar
 Add_dependency run glib
@@ -31,6 +30,7 @@ Add_dependency run pango
 Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
+Add_dependency run libhal
 Add_dependency build pkg-config
 Add_dependency build dbus-glib-devel
 Add_dependency build exo-devel
@@ -45,5 +45,6 @@ Add_dependency build pango-devel
 Add_dependency build cairo-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
+Add_dependency build libhal-devel
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils