diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e400ef3..0df7d459 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ if(NOT CMAKE_CXX_COMPILER)
   endif()
 endif()
 
+# TODO(jaagr): Replace with git tag
 project(lemonbuddy VERSION 0.1.2)
 
 set(CMAKE_MODULE_PATH
diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD
deleted file mode 100644
index de349b37..00000000
--- a/contrib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Michael Carlberg <c@rlberg.se>
-# Contributor: Michael Carlberg <c@rlberg.se>
-pkgname=lemonbuddy
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="A fast and easy-to-use tool for Lemonbar"
-arch=('i686' 'x86_64')
-url="https://github.com/jaagr/lemonbuddy"
-license=('MIT')
-groups=()
-depends=('sh' 'alsa-lib' 'libmpdclient' 'libxrandr' 'libsigc++')
-optdepends=('lemonbar-sm-git' 'i3-wm' 'i3ipc-glib-git')
-makedepends=('libsigc++' 'libmpdclient' 'libxrandr'
-'cmake' 'pkg-config' 'clang' 'glibc'
-'boost' 'libx11' 'wireless_tools')
-
-source=("git+https://github.com/jaagr/lemonbuddy.git#tag=${pkgver}")
-md5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname" || exit
-  git submodule update --init --recursive
-  mkdir build
-  cd build || exit
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname/build" || exit
-  make DESTDIR="$pkgdir/" install
-  cd .. || exit
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/contrib/lemonbuddy-git.aur/.SRCINFO b/contrib/lemonbuddy-git.aur/.SRCINFO
new file mode 100644
index 00000000..9a77c960
--- /dev/null
+++ b/contrib/lemonbuddy-git.aur/.SRCINFO
@@ -0,0 +1,28 @@
+pkgbase = lemonbuddy-git
+	pkgdesc = A fast and easy-to-use tool for Lemonbar
+	pkgver = 0.1.2.r0.g3975dab
+	pkgrel = 1
+	url = https://github.com/jaagr/lemonbuddy
+	arch = i686
+	arch = x86_64
+	license = MIT
+	makedepends = cmake
+	makedepends = pkg-config
+	makedepends = clang
+	makedepends = glibc
+	makedepends = boost
+	depends = bash
+	depends = libxrandr
+	optdepends = alsa-lib: volume module support
+	optdepends = libmpdclient: mpd module support
+	optdepends = wireless_tools: network module support
+	optdepends = libsigc++: i3 module support
+	optdepends = i3ipc-glib-git: i3 module support
+	optdepends = i3-wm: i3 module support
+	provides = lemonbuddy
+	conflicts = lemonbuddy
+	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git
+	md5sums = SKIP
+
+pkgname = lemonbuddy-git
+
diff --git a/contrib/lemonbuddy-git.aur/PKGBUILD b/contrib/lemonbuddy-git.aur/PKGBUILD
new file mode 100644
index 00000000..cc7f9001
--- /dev/null
+++ b/contrib/lemonbuddy-git.aur/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Michael Carlberg <c@rlberg.se>
+# Contributor: Michael Carlberg <c@rlberg.se>
+_pkgname=lemonbuddy
+pkgname="${_pkgname}-git"
+pkgver=0.1.2.r0.g3975dab
+pkgrel=1
+pkgdesc="A fast and easy-to-use tool for Lemonbar"
+arch=("i686" "x86_64")
+url="https://github.com/jaagr/lemonbuddy"
+license=("MIT")
+depends=("bash" "libxrandr")
+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"
+            "i3-wm: i3 module support")
+makedepends=("cmake" "pkg-config" "clang" "glibc" "boost")
+provides=("lemonbuddy")
+conflicts=("lemonbuddy")
+source=("${_pkgname}::git+${url}.git")
+md5sums=("SKIP")
+
+pkgver() {
+  cd "$_pkgname" || exit
+  git describe --long --tags | sed "s/-/.r/;s/-/./"
+}
+
+prepare() {
+  cd "$_pkgname" || exit
+  git submodule update --init --recursive
+  mkdir build
+}
+
+build() {
+  cd "${_pkgname}/build" || exit
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
+}
+
+package() {
+  cd "${_pkgname}/build" || exit
+  make DESTDIR="$pkgdir/" install
+  cd .. || exit
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+}
diff --git a/contrib/lemonbuddy.aur/.SRCINFO b/contrib/lemonbuddy.aur/.SRCINFO
new file mode 100644
index 00000000..9c5873f7
--- /dev/null
+++ b/contrib/lemonbuddy.aur/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = lemonbuddy
+	pkgdesc = A fast and easy-to-use tool for Lemonbar
+	pkgver = 0.1.2
+	pkgrel = 1
+	url = https://github.com/jaagr/lemonbuddy
+	arch = i686
+	arch = x86_64
+	license = MIT
+	makedepends = cmake
+	makedepends = pkg-config
+	makedepends = clang
+	makedepends = glibc
+	makedepends = boost
+	depends = bash
+	depends = libxrandr
+	optdepends = alsa-lib: volume module support
+	optdepends = libmpdclient: mpd module support
+	optdepends = wireless_tools: network module support
+	optdepends = libsigc++: i3 module support
+	optdepends = i3ipc-glib-git: i3 module support
+	optdepends = i3-wm: i3 module support
+	conflicts = lemonbuddy-git
+	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=0.1.2
+	md5sums = SKIP
+
+pkgname = lemonbuddy
+
diff --git a/contrib/lemonbuddy.aur/PKGBUILD b/contrib/lemonbuddy.aur/PKGBUILD
new file mode 100644
index 00000000..992b3a00
--- /dev/null
+++ b/contrib/lemonbuddy.aur/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Michael Carlberg <c@rlberg.se>
+# Contributor: Michael Carlberg <c@rlberg.se>
+pkgname=lemonbuddy
+pkgver=0.1.2
+pkgrel=1
+pkgdesc="A fast and easy-to-use tool for Lemonbar"
+arch=("i686" "x86_64")
+url="https://github.com/jaagr/lemonbuddy"
+license=("MIT")
+depends=("bash" "libxrandr")
+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"
+            "i3-wm: i3 module support")
+makedepends=("cmake" "pkg-config" "clang" "glibc" "boost")
+conflicts=("lemonbuddy-git")
+source=("${pkgname}::git+${url}.git#tag=${pkgver}")
+md5sums=("SKIP")
+
+prepare() {
+  cd "$pkgname" || exit
+  git submodule update --init --recursive
+  mkdir build
+}
+
+build() {
+  cd "${pkgname}/build" || exit
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
+}
+
+package() {
+  cd "${pkgname}/build" || exit
+  make DESTDIR="${pkgdir}/" install
+  cd .. || exit
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}