diff --git a/bat/.signature b/bat/.signature
index 2fa0ad25c..f30a7e95d 100644
--- a/bat/.signature
+++ b/bat/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33nht2f3N22Rp6Sv/SdEGpmKDM5E0dKmuP/8eDf2qhrfpSwvldOBdoju3EipANNPRbuo29pwh7JaUV79oK7avgI=
-SHA256 (Pkgfile) = 3012f10439ff037c06521aa9c5184cf304cb8f1aead15580f901078b7751207e
+RWSagIOpLGJF3xip4YEWK6dMNMZ2gB/28xrde/MJW8YDTMvsZQE3Z+89fDX4CV+zoUgYVNuQ8FDeyLZYCEs19Fq5uKk5/1obMQ0=
+SHA256 (Pkgfile) = b4d5ddfbb4b5216597850cda120041ee1fa66303076837fddab3c66419844cd8
 SHA256 (.footprint) = 7d7c597044f485aecf5b2c12f56d294b1f8a66f7e2515693ad3b29aba8628209
 SHA256 (bat-0.22.1.tar.gz) = 25e45debf7c86794281d63a51564feefa96fdfdf575381e3adc5c06653ecaeca
diff --git a/bat/Pkgfile b/bat/Pkgfile
index 45e2a0739..25d5cc963 100644
--- a/bat/Pkgfile
+++ b/bat/Pkgfile
@@ -2,20 +2,22 @@
 # URL: https://github.com/sharkdp/bat
 # Maintainer: Tim Biermann, tbier at posteo dot de
 # Depends on: rust
+# Optional: libgit2
 
 name=bat
 version=0.22.1
-release=1
+release=2
 source=(https://github.com/sharkdp/bat/archive/v$version/$name-$version.tar.gz)
 
 build() {
-  cd $name-$version
+  prt-get isinst libgit2 && PKGMK_BAT+=' git'
 
   prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
-  mkdir "$PKGMK_SOURCE_DIR/rust" || true
-  export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
+  [[ ! -e $PKGMK_SOURCE_DIR/rust ]] && mkdir $PKGMK_SOURCE_DIR/rust
 
-  cargo update
-  cargo build --release --locked
-  install -Dt $PKG/usr/bin target/release/bat
+  cargo build --release --manifest-path $name-$version/Cargo.toml \
+    --no-default-features \
+    --features "bugreport build-assets minimal-application $PKGMK_BAT"
+
+  install -Dt $PKG/usr/bin $name-$version/target/release/$name
 }