diff --git a/srcpkgs/bspwm/template b/srcpkgs/bspwm/template
new file mode 100644
index 0000000000..0504eaf526
--- /dev/null
+++ b/srcpkgs/bspwm/template
@@ -0,0 +1,20 @@
+# Template file for 'bspwm'
+pkgname=bspwm
+version=0.8.8
+revision=1
+build_style=gnu-makefile
+makedepends="libxcb-devel xcb-util-devel xcb-util-wm-devel"
+short_desc="A tiling window manager based on binary space partitioning"
+maintainer="unmaintained"
+license="BSD"
+homepage="https://github.com/baskerville/bspwm"
+
+do_fetch() {
+	local url="git://github.com/baskerville/bspwm"
+	msg_normal "Fetching source from $url ...\n"
+	git clone --branch 0.8.8 ${url} ${pkgname}-${version}
+}
+
+post_install() {
+	vinstall LICENSE 644 usr/share/licenses/$pkgname
+}
diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index 6a87c53751..01db795df5 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,7 +1,7 @@
 # Template file for 'qingy'
 pkgname="qingy"
 version="1.0.0"
-revision=3
+revision=6
 build_style=gnu-configure
 makedepends="ncurses-devel openssl-devel"
 configure_args="--disable-static --disable-DirectFB-support"
@@ -40,4 +40,6 @@ fi
 
 post_install() {
 	vinstall ${FILESDIR}/qingy@.service 644 usr/lib/systemd/system
+    sed -i '/pam_console/d' ${DESTDIR}/etc/pam.d/qingy
+    sed -i 's#usr/X11R6/bin#usr/bin#' ${DESTDIR}/etc/qingy/settings
 }