diff --git a/srcpkgs/xbps/libxbps-devel.template b/srcpkgs/xbps/libxbps-devel.template
index fd548852667..8f61e92b98b 100644
--- a/srcpkgs/xbps/libxbps-devel.template
+++ b/srcpkgs/xbps/libxbps-devel.template
@@ -2,7 +2,7 @@
 #
 short_desc="${short_desc} - runtime library (development files)"
 depends="zlib-devel proplib-devel confuse-devel libfetch-devel
- libarchive-devel libxbps>=$version"
+ libarchive-devel libxbps>=${version}"
 replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
 
 do_install() {
diff --git a/srcpkgs/xbps/patches/0001-libxbps-fixed-regression-executing-pre-remove-action.patch b/srcpkgs/xbps/patches/0001-libxbps-fixed-regression-executing-pre-remove-action.patch
new file mode 100644
index 00000000000..72a68180408
--- /dev/null
+++ b/srcpkgs/xbps/patches/0001-libxbps-fixed-regression-executing-pre-remove-action.patch
@@ -0,0 +1,37 @@
+From 0f22579a34741e2a33f9bdb06b0ad0f1681cdd3d Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Fri, 28 Dec 2012 10:42:13 +0100
+Subject: [PATCH] libxbps: fixed regression executing "pre-remove" action in
+ installed pkgs.
+
+---
+ NEWS                 | 3 +++
+ lib/package_remove.c | 5 ++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/lib/package_remove.c b/lib/package_remove.c
+index 0b6fc03..3118e19 100644
+--- a/lib/package_remove.c
++++ b/lib/package_remove.c
+@@ -233,8 +233,6 @@ xbps_remove_pkg(struct xbps_handle *xhp,
+ 	if (!update)
+ 		xbps_set_cb_state(xhp, XBPS_STATE_REMOVE, 0, pkgname, version, NULL);
+ 
+-	pkgver = xbps_xasprintf("%s-%s", pkgname, version);
+-
+ 	if (chdir(xhp->rootdir) == -1) {
+ 		rv = errno;
+ 		xbps_set_cb_state(xhp, XBPS_STATE_REMOVE_FAIL,
+@@ -259,7 +257,8 @@ xbps_remove_pkg(struct xbps_handle *xhp,
+ 	 * Run the pre remove action.
+ 	 */
+ 	if (pkgd) {
+-		rv = xbps_pkg_exec_script(xhp, pkgd, "remove", "pre", update);
++		rv = xbps_pkg_exec_script(xhp, pkgd, "remove-script",
++		    "pre", update);
+ 		if (rv != 0) {
+ 			xbps_set_cb_state(xhp, XBPS_STATE_REMOVE_FAIL,
+ 			    errno, pkgname, version,
+-- 
+1.8.0.3
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ab7f444aa4b..960ac9e4a92 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,12 +1,12 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.19.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --with-tests --with-static"
 depends="xbps-triggers"
-makedepends="which pkg-config zlib-devel proplib-devel>=0.6.2 openssl-devel
+makedepends="which pkg-config proplib-devel>=0.6.2 openssl-devel
  libfetch-devel libarchive-devel confuse-devel atf-devel>=0.16"
 conf_files="/etc/xbps/xbps.conf"
 subpackages="libxbps libxbps-devel xbps-static xbps-tests"