diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index e95cd46ddc..dae940bea0 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,8 +2,8 @@
 #
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
-version=0.44.1
-revision=4
+version=0.45
+revision=1
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -25,6 +25,6 @@ do_configure() {
 }
 do_install() {
 	make DESTDIR=${wrksrc}/static-install install
-	vmkdir usr/sbin
-	mv ${wrksrc}/static-install/usr/sbin/*.static ${DESTDIR}/usr/sbin
+	vmkdir usr/bin
+	mv ${wrksrc}/static-install/usr/bin/*.static ${DESTDIR}/usr/bin
 }
diff --git a/srcpkgs/xbps/patches/0001-xbps-install-question.c-char-is-not-enough-for-fgetc.patch b/srcpkgs/xbps/patches/0001-xbps-install-question.c-char-is-not-enough-for-fgetc.patch
deleted file mode 100644
index 091a3130a4..0000000000
--- a/srcpkgs/xbps/patches/0001-xbps-install-question.c-char-is-not-enough-for-fgetc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 62b21a4f93a8f3dcc7350630b5bf250af7663757 Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sat, 21 Mar 2015 09:45:29 +0100
-Subject: [PATCH] xbps-install/question.c: char is not enough for fgetc, use
- int (HI GOTTOX)
-
----
- bin/xbps-install/question.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/xbps-install/question.c b/bin/xbps-install/question.c
-index 1d61af2..bb74214 100644
---- bin/xbps-install/question.c
-+++ bin/xbps-install/question.c
-@@ -40,7 +40,7 @@
- static bool
- question(bool preset, const char *fmt, va_list ap)
- {
--	char response;
-+	int response;
- 
- 	vfprintf(stderr, fmt, ap);
- 	if(preset)
--- 
-2.3.3
-
diff --git a/srcpkgs/xbps/patches/0002-xbps-query-8-do-not-truncate-output-if-stdout-is-not.patch b/srcpkgs/xbps/patches/0002-xbps-query-8-do-not-truncate-output-if-stdout-is-not.patch
deleted file mode 100644
index af627f83d7..0000000000
--- a/srcpkgs/xbps/patches/0002-xbps-query-8-do-not-truncate-output-if-stdout-is-not.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bc97851fdbee84af1eb19a987b9bc08167b8d6f7 Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@voidlinux.eu>
-Date: Wed, 15 Apr 2015 18:40:34 +0200
-Subject: [PATCH] xbps-query(8): do not truncate output if stdout is not a tty.
-
----
- NEWS                    |  4 ++++
- bin/xbps-install/util.c | 14 ++++++++++----
- bin/xbps-query/list.c   |  2 +-
- bin/xbps-query/search.c |  2 +-
- 4 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/bin/xbps-install/util.c b/bin/xbps-install/util.c
-index 1ce45d8..3c05738 100644
---- bin/xbps-install/util.c
-+++ bin/xbps-install/util.c
-@@ -41,10 +41,16 @@ get_maxcols(void)
- {
- 	struct winsize ws;
- 
--	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == 0)
--		return ws.ws_col ? ws.ws_col : 80;
--
--	return 80;
-+	if (!isatty(STDOUT_FILENO) && errno == ENOTTY) {
-+		/* not a TTY, don't use any limit */
-+		return 0;
-+	}
-+	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1) {
-+		/* 80x24 terminal */
-+		return 80;
-+	}
-+	/* TTY columns */
-+	return ws.ws_col;
- }
- 
- void
-diff --git a/bin/xbps-query/list.c b/bin/xbps-query/list.c
-index 45e0f07..542b870 100644
---- bin/xbps-query/list.c
-+++ bin/xbps-query/list.c
-@@ -72,7 +72,7 @@ list_pkgs_in_dict(struct xbps_handle *xhp _unused,
- 
- 	tmp[i] = '\0';
- 	len = strlen(tmp) + strlen(short_desc) + 2;
--	if (len > lpc->maxcols) {
-+	if (lpc->maxcols && len > lpc->maxcols) {
- 		out = malloc(lpc->maxcols+1);
- 		assert(out);
- 		snprintf(out, lpc->maxcols - 3,
-diff --git a/bin/xbps-query/search.c b/bin/xbps-query/search.c
-index c41ef5e..c07f84c 100644
---- bin/xbps-query/search.c
-+++ bin/xbps-query/search.c
-@@ -80,7 +80,7 @@ print_results(struct xbps_handle *xhp, struct search_data *sd)
- 			inststr = "[-]";
- 
- 		len = strlen(inststr) + strlen(tmp) + strlen(desc) + 3;
--		if ((int)len > sd->maxcols) {
-+		if (sd->maxcols && (int)len > sd->maxcols) {
- 			out = malloc(sd->maxcols+1);
- 			assert(out);
- 			snprintf(out, sd->maxcols-3, "%s %s %s",
--- 
-2.3.5
-
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ff385a9eb0..449c413eb5 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.44.1
-revision=8
+version=0.45
+revision=1
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"