diff --git a/contrib/lemonbuddy-git.aur/.SRCINFO b/contrib/lemonbuddy-git.aur/.SRCINFO
index dc83c2cd..8f298f20 100644
--- a/contrib/lemonbuddy-git.aur/.SRCINFO
+++ b/contrib/lemonbuddy-git.aur/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lemonbuddy-git
 	pkgdesc = A fast and easy-to-use status bar
 	pkgver = 2.1.0
-	pkgrel = 1
+	pkgrel = 5
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
 	arch = x86_64
@@ -10,15 +10,13 @@ pkgbase = lemonbuddy-git
 	makedepends = python2
 	makedepends = pkg-config
 	makedepends = clang35
-	makedepends = glibc
+	makedepends = libc++
 	makedepends = boost
 	depends = libxft
 	depends = xcb-util-wm
 	optdepends = alsa-lib: volume module support
 	optdepends = libmpdclient: mpd module support
 	optdepends = wireless_tools: network module support
-	optdepends = libsigc++: i3 module support
-	optdepends = jsoncpp: i3 module support
 	optdepends = i3ipc-glib-git: i3 module support
 	provides = lemonbuddy
 	conflicts = lemonbuddy
diff --git a/contrib/lemonbuddy-git.aur/PKGBUILD b/contrib/lemonbuddy-git.aur/PKGBUILD
index 87c4e4f7..737cdf6f 100644
--- a/contrib/lemonbuddy-git.aur/PKGBUILD
+++ b/contrib/lemonbuddy-git.aur/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=lemonbuddy
 pkgname="${_pkgname}-git"
 pkgver=2.1.0
-pkgrel=1
+pkgrel=5
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
 url="https://github.com/jaagr/lemonbuddy"
@@ -12,9 +12,8 @@ depends=("libxft" "xcb-util-wm")
 optdepends=("alsa-lib: volume module support"
             "libmpdclient: mpd module support"
             "wireless_tools: network module support"
-            "jsoncpp: i3 module support"
             "i3ipc-glib-git: i3 module support")
-makedepends=("cmake" "python2" "pkg-config" "clang35" "glibc" "boost")
+makedepends=("cmake" "python2" "pkg-config" "clang35" "libc++" "boost")
 provides=("lemonbuddy")
 conflicts=("lemonbuddy")
 source=("${_pkgname}::git+${url}.git")
@@ -36,6 +35,7 @@ build() {
   cmake \
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \
+    -DCMAKE_EXE_LINKER_FLAGS=-lc++ \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr ..
   make
diff --git a/contrib/lemonbuddy.aur/.SRCINFO b/contrib/lemonbuddy.aur/.SRCINFO
index 4afdaf09..c9cc9d9e 100644
--- a/contrib/lemonbuddy.aur/.SRCINFO
+++ b/contrib/lemonbuddy.aur/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lemonbuddy
 	pkgdesc = A fast and easy-to-use status bar
 	pkgver = 2.1.0
-	pkgrel = 1
+	pkgrel = 5
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
 	arch = x86_64
@@ -10,15 +10,13 @@ pkgbase = lemonbuddy
 	makedepends = python2
 	makedepends = pkg-config
 	makedepends = clang35
-	makedepends = glibc
+	makedepends = libc++
 	makedepends = boost
 	depends = libxft
 	depends = xcb-util-wm
 	optdepends = alsa-lib: volume module support
 	optdepends = libmpdclient: mpd module support
 	optdepends = wireless_tools: network module support
-	optdepends = libsigc++: i3 module support
-	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=2.1.0
diff --git a/contrib/lemonbuddy.aur/PKGBUILD b/contrib/lemonbuddy.aur/PKGBUILD
index 4b9d148a..24a7a233 100644
--- a/contrib/lemonbuddy.aur/PKGBUILD
+++ b/contrib/lemonbuddy.aur/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Carlberg <c@rlberg.se>
 pkgname=lemonbuddy
 pkgver=2.1.0
-pkgrel=1
+pkgrel=5
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
 url="https://github.com/jaagr/lemonbuddy"
@@ -11,9 +11,8 @@ depends=("libxft" "xcb-util-wm")
 optdepends=("alsa-lib: volume module support"
             "libmpdclient: mpd module support"
             "wireless_tools: network module support"
-            "libsigc++: i3 module support"
             "i3ipc-glib-git: i3 module support")
-makedepends=("cmake" "python2" "pkg-config" "clang35" "glibc" "boost")
+makedepends=("cmake" "python2" "pkg-config" "clang35" "libc++" "boost")
 conflicts=("lemonbuddy-git")
 source=("${pkgname}::git+${url}.git#tag=${pkgver}")
 md5sums=("SKIP")
@@ -29,6 +28,7 @@ build() {
   cmake \
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \
+    -DCMAKE_EXE_LINKER_FLAGS=-lc++ \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr ..
   make