diff --git a/contrib/polybar-git.aur/.SRCINFO b/contrib/polybar-git.aur/.SRCINFO
index 8d3a947a..d4fd55d8 100644
--- a/contrib/polybar-git.aur/.SRCINFO
+++ b/contrib/polybar-git.aur/.SRCINFO
@@ -25,8 +25,6 @@ pkgbase = polybar-git
 	optdepends = siji-git: Font used in example config
 	provides = polybar
 	conflicts = polybar
-	conflicts = lemonbuddy-git
-	conflicts = lemonbuddy
 	source = polybar::git+https://github.com/jaagr/polybar.git
 	install = polybar.install
 	md5sums = SKIP
diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-git.aur/PKGBUILD
index 4fd25c2f..bbae1893 100644
--- a/contrib/polybar-git.aur/PKGBUILD
+++ b/contrib/polybar-git.aur/PKGBUILD
@@ -19,33 +19,30 @@ optdepends=("alsa-lib: volume module support"
             "curl: github module support")
 makedepends=("cmake" "git" "python" "python2" "pkg-config")
 provides=("polybar")
-conflicts=("polybar" "lemonbuddy-git" "lemonbuddy")
+conflicts=("polybar")
 install="${_pkgname}.install"
 source=("${_pkgname}::git+${url}.git")
 md5sums=("SKIP")
 
 pkgver() {
-  cd "$_pkgname" || exit
-  git describe --long --tags | sed "s/-/.r/;s/-/./g"
+  git -C "${_pkgname}" describe --long --tags | sed "s/-/.r/;s/-/./g"
 }
 
 prepare() {
-  cd "$_pkgname" || exit
-  git submodule update --init --recursive
-  mkdir build
+  git -C "${_pkgname}" submodule update --init --recursive
+  mkdir -p "${_pkgname}/build"
 }
 
 build() {
-  cd "${_pkgname}" || exit
-  [ -x version.sh ] && ./version.sh >/dev/null
-  cd build || exit
+  cd "${_pkgname}/build" || exit 1
+  if [ -x ../common/version.sh ]; then
+    ../common/version.sh
+  fi
   cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
+  cmake --build .
 }
 
 package() {
-  cd "${_pkgname}/build" || exit
-  make DESTDIR="$pkgdir/" install
-  cd .. || exit
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  cmake --build "${_pkgname}/build" --target install -- DESTDIR="${pkgdir}"
+  install -Dm644 "${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
diff --git a/contrib/polybar.aur/.SRCINFO b/contrib/polybar.aur/.SRCINFO
index d77fc955..594ee030 100644
--- a/contrib/polybar.aur/.SRCINFO
+++ b/contrib/polybar.aur/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = polybar
 	arch = x86_64
 	license = MIT
 	makedepends = cmake
+	makedepends = git
 	makedepends = python
 	makedepends = python2
 	makedepends = pkg-config
@@ -23,8 +24,6 @@ pkgbase = polybar
 	optdepends = ttf-unifont: Font used in example config
 	optdepends = siji-git: Font used in example config
 	conflicts = polybar-git
-	conflicts = lemonbuddy-git
-	conflicts = lemonbuddy
 	source = polybar::git+https://github.com/jaagr/polybar.git#tag=3.0.2
 	install = polybar.install
 	md5sums = SKIP
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
index 1a92d353..7676a3db 100644
--- a/contrib/polybar.aur/PKGBUILD
+++ b/contrib/polybar.aur/PKGBUILD
@@ -16,27 +16,24 @@ optdepends=("alsa-lib: volume module support"
             "ttf-unifont: Font used in example config"
             "siji-git: Font used in example config"
             "curl: github module support")
-makedepends=("cmake" "python" "python2" "pkg-config")
-conflicts=("polybar-git" "lemonbuddy-git" "lemonbuddy")
+makedepends=("cmake" "git" "python" "python2" "pkg-config")
+conflicts=("polybar-git")
 install="${pkgname}.install"
 source=("${pkgname}::git+${url}.git#tag=${pkgver}")
 md5sums=("SKIP")
 
 prepare() {
-  cd "$pkgname" || exit
-  git submodule update --init --recursive
-  mkdir build
+  git -C "${pkgname}" submodule update --init --recursive
+  mkdir -p "${pkgname}/build"
 }
 
 build() {
-  cd "${pkgname}/build" || exit
+  cd "${pkgname}/build" || exit 1
   cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
+  cmake --build .
 }
 
 package() {
-  cd "${pkgname}/build" || exit
-  make DESTDIR="${pkgdir}/" install
-  cd .. || exit
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cmake --build "${pkgname}/build" --target install -- DESTDIR="${pkgdir}"
+  install -Dm644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }