diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index d54042ff19..ab25c1be75 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,7 +1,7 @@
 # Template file for 'abiword'
 pkgname=abiword
 version=3.0.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-plugins --enable-clipart --enable-templates"
 hostmakedepends="automake libtool flex pkg-config"
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index db109ea93c..4e95cb116d 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=5.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev
  --with-systemdsystemunitdir=/usr/lib/systemd/system
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 32cc047c35..27461b0bc2 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.3.2
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DENABLE_UPOWER_SUPPORT=OFF"
 hostmakedepends="cmake pkg-config"
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8254d29d63..6379971639 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.12.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-openldap --disable-uoa
  --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 96129e0965..9f17d0db4e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.12.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-pst-import --with-openldap --disable-bogofilter
  --with-krb5=/usr --disable-schemas-compile --disable-static --disable-spamassassin
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5a0e9a8b86..028bdd8d9d 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool gnome-doc-utils"
diff --git a/srcpkgs/kdepimlibs/template b/srcpkgs/kdepimlibs/template
index 223ad7d580..0cda23a047 100644
--- a/srcpkgs/kdepimlibs/template
+++ b/srcpkgs/kdepimlibs/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepimlibs'
 pkgname=kdepimlibs
 version=4.12.5
-revision=1
+revision=2
 short_desc="KDE PIM Libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL, LGPL, FDL"
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index ec777dd33e..0ba839380f 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,7 +1,7 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.8.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+-devel dbus-glib-devel
@@ -11,5 +11,5 @@ short_desc="Simple calendar application for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/projects/orage/"
 license="GPL-2"
-distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
+distfiles="http://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
 checksum=9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e