diff --git a/cloud-hypervisor/PKGBUILD b/cloud-hypervisor/PKGBUILD
index c40c512..f9c2be3 100644
--- a/cloud-hypervisor/PKGBUILD
+++ b/cloud-hypervisor/PKGBUILD
@@ -1,36 +1,42 @@
 # Maintainer: George Rawlinson <grawlinson@archlinux.org>
 
 pkgname=cloud-hypervisor
-pkgver=20.2
+pkgver=21.0
 pkgrel=1
 pkgdesc="A Virtual Machine Monitor for modern cloud workloads"
 url="https://www.cloudhypervisor.org"
 arch=('x86_64')
 license=('Apache')
 depends=('gcc-libs')
-makedepends=('rust')
+makedepends=('git' 'rust')
 optdepends=('qemu-headless: for virtiofsd')
 install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v$pkgver.tar.gz")
-sha512sums=('eba58f505edaa748c9884e7479b35030a611cd36b4b2bbd3b18e5c579fb7cb28815c6301f1b60c68dcf62d4c496d28d7e8b3bf13369833bc491a8b8360724eb8')
-b2sums=('1e8d03d6913cbd186cbfd62c4151b3be453c1e4b1fa8c06232722c692c35bcfc7167d6a1318459d6742b5865b2d58d097ae373dc798ecfd7a15b171a72fcb0a3')
+options=('!lto')
+_commit='95ca79974a32f3dab5987032361d0ecd2aa65512'
+source=("$pkgname::git+https://github.com/cloud-hypervisor/cloud-hypervisor.git#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+  cd "$pkgname"
+  git describe --tags | sed 's/^v//'
+}
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
   # download dependencies
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   # FTBFS: --all-features due to hypervisor not compiling
-  # cargo build --release --locked --all-features --target-dir=target
+  # cargo build --release --frozen --all-features
   cargo build --release --frozen
 }
 
 package() {
-   find "$pkgname-$pkgver/target/release" \
+   find "$pkgname/target/release" \
      -maxdepth 1 \
      -executable \
      -type f \