diff --git a/contrib/polybar-git.aur/.SRCINFO b/contrib/polybar-git.aur/.SRCINFO
new file mode 100644
index 00000000..31494f7d
--- /dev/null
+++ b/contrib/polybar-git.aur/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = polybar-git
+	pkgdesc = A fast and easy-to-use status bar
+	pkgver = 2.3.0
+	pkgrel = 1
+	url = https://github.com/jaagr/polybar
+	arch = i686
+	arch = x86_64
+	license = MIT
+	makedepends = cmake
+	makedepends = python2
+	makedepends = pkg-config
+	makedepends = boost
+	depends = libxft
+	depends = xcb-util-wm
+	depends = xcb-util-image
+	optdepends = alsa-lib: volume module support
+	optdepends = libmpdclient: mpd module support
+	optdepends = wireless_tools: network module support
+	optdepends = jsoncpp: i3 module support
+	optdepends = i3ipc-glib-git: i3 module support
+	provides = polybar
+	conflicts = polybar
+	conflicts = lemonbuddy-git
+	conflicts = lemonbuddy
+	source = polybar::git+https://github.com/jaagr/polybar.git
+	md5sums = SKIP
+
+pkgname = polybar-git
+
diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-git.aur/PKGBUILD
new file mode 100644
index 00000000..056b253a
--- /dev/null
+++ b/contrib/polybar-git.aur/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Michael Carlberg <c@rlberg.se>
+# Contributor: Michael Carlberg <c@rlberg.se>
+_pkgname=polybar
+pkgname="${_pkgname}-git"
+pkgver=2.3.0
+pkgrel=1
+pkgdesc="A fast and easy-to-use status bar"
+arch=("i686" "x86_64")
+url="https://github.com/jaagr/polybar"
+license=("MIT")
+depends=("libxft" "xcb-util-wm" "xcb-util-image")
+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" "boost")
+provides=("polybar")
+conflicts=("polybar" "lemonbuddy-git" "lemonbuddy")
+source=("${_pkgname}::git+${url}.git")
+md5sums=("SKIP")
+
+pkgver() {
+  cd "$_pkgname" || exit
+  git describe --long --tags | sed "s/-/.r/;s/-/./g"
+}
+
+prepare() {
+  cd "$_pkgname" || exit
+  git submodule update --init --recursive
+  mkdir build
+}
+
+build() {
+  cd "${_pkgname}" || exit
+  [ -x version.sh ] && ./version.sh >/dev/null
+  cd build || exit
+  cmake -DCMAKE_BUILD_TYPE=Release -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/polybar.aur/.SRCINFO b/contrib/polybar.aur/.SRCINFO
new file mode 100644
index 00000000..a943a17c
--- /dev/null
+++ b/contrib/polybar.aur/.SRCINFO
@@ -0,0 +1,28 @@
+pkgbase = polybar
+	pkgdesc = A fast and easy-to-use status bar
+	pkgver = 2.3.0
+	pkgrel = 1
+	url = https://github.com/jaagr/polybar
+	arch = i686
+	arch = x86_64
+	license = MIT
+	makedepends = cmake
+	makedepends = python2
+	makedepends = pkg-config
+	makedepends = boost
+	depends = libxft
+	depends = xcb-util-wm
+	depends = xcb-util-image
+	optdepends = alsa-lib: volume module support
+	optdepends = libmpdclient: mpd module support
+	optdepends = wireless_tools: network module support
+	optdepends = jsoncpp: i3 module support
+	optdepends = i3ipc-glib-git: i3 module support
+	conflicts = polybar-git
+	conflicts = lemonbuddy-git
+	conflicts = lemonbuddy
+	source = polybar::git+https://github.com/jaagr/polybar.git#tag=2.3.0
+	md5sums = SKIP
+
+pkgname = polybar
+
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
new file mode 100644
index 00000000..ad3395ea
--- /dev/null
+++ b/contrib/polybar.aur/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Michael Carlberg <c@rlberg.se>
+# Contributor: Michael Carlberg <c@rlberg.se>
+pkgname=polybar
+pkgver=2.3.0
+pkgrel=1
+pkgdesc="A fast and easy-to-use status bar"
+arch=("i686" "x86_64")
+url="https://github.com/jaagr/polybar"
+license=("MIT")
+depends=("libxft" "xcb-util-wm" "xcb-util-image")
+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" "boost")
+conflicts=("polybar-git" "lemonbuddy-git" "lemonbuddy")
+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_BUILD_TYPE=Release -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"
+}