diff --git a/contrib/lemonbuddy-git.aur/.SRCINFO b/contrib/lemonbuddy-git.aur/.SRCINFO
index ffd3c37b..b487ae94 100644
--- a/contrib/lemonbuddy-git.aur/.SRCINFO
+++ b/contrib/lemonbuddy-git.aur/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lemonbuddy-git
 	pkgdesc = A fast and easy-to-use tool for Lemonbar
-	pkgver = 1.4.0
+	pkgver = 1.4.1
 	pkgrel = 1
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
diff --git a/contrib/lemonbuddy-git.aur/PKGBUILD b/contrib/lemonbuddy-git.aur/PKGBUILD
index 9d5594d4..cc504860 100644
--- a/contrib/lemonbuddy-git.aur/PKGBUILD
+++ b/contrib/lemonbuddy-git.aur/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Carlberg <c@rlberg.se>
 _pkgname=lemonbuddy
 pkgname="${_pkgname}-git"
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
diff --git a/contrib/lemonbuddy.aur/.SRCINFO b/contrib/lemonbuddy.aur/.SRCINFO
index 9c7f0734..a5d60cb4 100644
--- a/contrib/lemonbuddy.aur/.SRCINFO
+++ b/contrib/lemonbuddy.aur/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lemonbuddy
 	pkgdesc = A fast and easy-to-use tool for Lemonbar
-	pkgver = 1.4.0
-	pkgrel = 1
+	pkgver = 1.4.1
+	pkgrel = 2
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = lemonbuddy
 	optdepends = jsoncpp: i3 module support
 	optdepends = i3ipc-glib-git: i3 module support
 	conflicts = lemonbuddy-git
-	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=1.4.0
+	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=1.4.1
 	md5sums = SKIP
 
 pkgname = lemonbuddy
diff --git a/contrib/lemonbuddy.aur/PKGBUILD b/contrib/lemonbuddy.aur/PKGBUILD
index 8e510dc1..58b40641 100644
--- a/contrib/lemonbuddy.aur/PKGBUILD
+++ b/contrib/lemonbuddy.aur/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Michael Carlberg <c@rlberg.se>
 # Contributor: Michael Carlberg <c@rlberg.se>
 pkgname=lemonbuddy
-pkgver=1.4.0
-pkgrel=1
+pkgver=1.4.1
+pkgrel=2
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
 url="https://github.com/jaagr/lemonbuddy"
@@ -23,13 +23,13 @@ prepare() {
   cd "$pkgname" || exit
   git submodule update --init --recursive
   mkdir build
+  sed 's/python2.7/python3.5/g' -i lib/xpp/CMakeLists.txt
 }
 
 build() {
   cd "${pkgname}/build" || exit
   cmake -DCMAKE_INSTALL_PREFIX=/usr ..
   make
-  sed 's/python2.7/python3.5/g' -i lib/xpp/CMakeLists.txt
 }
 
 package() {
diff --git a/contrib/lemonbuddy.xbps/template b/contrib/lemonbuddy.xbps/template
index 0f32ac12..ebc8332b 100644
--- a/contrib/lemonbuddy.xbps/template
+++ b/contrib/lemonbuddy.xbps/template
@@ -1,35 +1,46 @@
 # Template file for 'lemonbuddy'
 pkgname=lemonbuddy
-version=1.2.1
+version=1.4.1
 revision=1
-_i3ipcpp_version=0.1.3
-_lemonbar_version=1.1
+_i3ipcpp_version=0.3.0
+_xpp_version=1.0.0
 build_style=cmake
-hostmakedepends="clang pkg-config"
-makedepends="libX11-devel libXrandr-devel boost-devel
-	$(vopt_if alsa "alsa-lib-devel")
-	$(vopt_if i3 "i3-devel i3ipc-glib-devel libsigc++-devel")
-	$(vopt_if mpd "libmpdclient-devel")
-	$(vopt_if network "wireless_tools-devel")"
+configure_args="
+	-DENABLE_ALSA=$(vopt_if alsa ON OFF)
+	-DENABLE_I3=$(vopt_if i3 ON OFF)
+	-DENABLE_MPD=$(vopt_if mpd ON OFF)
+	-DENABLE_NETWORK=$(vopt_if network ON OFF)"
+hostmakedepends="clang pkg-config xcb-proto"
+makedepends="libX11-devel libxcb-devel boost-devel
+	${build_option_alsa:+alsa-lib-devel}
+	${build_option_i3:+i3-devel i3ipc-glib-devel libsigc++-devel jsoncpp-devel}
+	${build_option_mpd:+libmpdclient-devel}
+	${build_option_network:+wireless_tools-devel}"
 short_desc="A fast and easy-to-use tool for Lemonbar"
 maintainer="Michael Carlberg <c@rlberg.se>"
 license="MIT"
 homepage="https://github.com/jaagr/lemonbuddy"
 distfiles="
 	https://github.com/jaagr/lemonbuddy/archive/${version}.tar.gz
-	https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz
-	https://github.com/jaagr/bar/archive/v${_lemonbar_version}.tar.gz"
+	https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz
+	${build_option_i3:+https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz}"
 checksum="
-	dfbeb74aaac49cb0f3c5c98466aadf2477c6a709025174e11e1da7ad7edafef4
-	fb5ea31bf2d008065512f12ab9d9cc8304b2a4e6ba2ae93082df29712f372449
-	d9073ecc3d2638804a723d47c74666ba3cd1c3771dfe254809de01ec5c428d4a"
+	09de151bea68bcb3d646e65628b1ce5c3bb89a2a1426bb69996976468e9c13e8
+	a0f0f7b3f007e6302835fe7dfb7b935df8c4ab8c9f76b30afb652a04199158e9
+	${build_option_i3:+85b588f957740f89a275b4b2acc27cab78ee2606f5e68e62ce61b9c1278bb366}"
 
 build_options="alsa i3 mpd network"
 build_options_default="$build_options"
 
 post_extract() {
-	mv ../i3ipcpp-$_i3ipcpp_version contrib/i3ipcpp
-	mv ../bar-$_lemonbar_version contrib/lemonbar-sm-git
+	[ -d ../i3ipcpp-${_i3ipcpp_version} ] && \
+		mv ../i3ipcpp-${_i3ipcpp_version}/* lib/i3ipcpp/ || true
+	[ -d ../xpp-${_xpp_version} ] &&  \
+		mv ../xpp-${_xpp_version}/* lib/xpp/ || true
+}
+
+pre_build() {
+	./version.sh ${version}
 }
 
 post_install() {