diff --git a/srcpkgs/bspwm/patches/fix-possible-buffer-overflow.patch b/srcpkgs/bspwm/patches/fix-possible-buffer-overflow.patch
new file mode 100644
index 00000000000..7dd75a0d136
--- /dev/null
+++ b/srcpkgs/bspwm/patches/fix-possible-buffer-overflow.patch
@@ -0,0 +1,14 @@
+Patch backported from: https://github.com/baskerville/bspwm/commit/ab81f1b10148311d0b798f96d472d4afcbb77ce5
+--- src/bspwm.c.orig	2018-12-30 21:34:53.329062706 -0600
++++ src/bspwm.c	2018-12-30 21:36:16.149061038 -0600
+@@ -163,8 +163,8 @@
+ 
+ 			if (FD_ISSET(sock_fd, &descriptors)) {
+ 				cli_fd = accept(sock_fd, NULL, 0);
+-				if (cli_fd > 0 && (n = recv(cli_fd, msg, sizeof(msg), 0)) > 0) {
+-					msg[n] = '\0';
++        if (cli_fd > 0 && (n = recv(cli_fd, msg, sizeof(msg)-1, 0)) > 0) {
++          msg[n] = '\0';
+ 					FILE *rsp = fdopen(cli_fd, "w");
+ 					if (rsp != NULL) {
+ 						handle_message(msg, n, rsp);
diff --git a/srcpkgs/bspwm/template b/srcpkgs/bspwm/template
index 3f91aba7029..f9dbb6d7209 100644
--- a/srcpkgs/bspwm/template
+++ b/srcpkgs/bspwm/template
@@ -1,10 +1,10 @@
 # Template file for 'bspwm'
 pkgname=bspwm
 version=0.9.5
-revision=2
+revision=3
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="Tiling window manager based on binary space partitioning"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/baskerville/bspwm"
 distfiles="https://github.com/baskerville/bspwm/archive/${version}.tar.gz"