diff --git a/libnbd/.SRCINFO b/libnbd/.SRCINFO
index cda7501efd..82e980dd3f 100644
--- a/libnbd/.SRCINFO
+++ b/libnbd/.SRCINFO
@@ -1,15 +1,27 @@
 pkgbase = libnbd
 	pkgdesc = NBD client library in userspace
-	pkgver = 1.18.0
-	pkgrel = 1
+	pkgver = 1.20.0
+	pkgrel = 3
 	url = https://gitlab.com/nbdkit/libnbd
 	arch = x86_64
-	license = LGPL
+	license = LGPL-2.1-or-later
 	makedepends = perl
-	source = http://download.libguestfs.org/libnbd/1.18-stable/libnbd-1.18.0.tar.gz
-	source = http://download.libguestfs.org/libnbd/1.18-stable/libnbd-1.18.0.tar.gz.sig
+	makedepends = ocamlbuild
+	makedepends = ocaml-findlib
+	makedepends = rust
+	makedepends = fuse3
+	makedepends = python
+	makedepends = go
+	depends = glibc
+	depends = gnutls
+	depends = libxml2
+	optdepends = fuse3: For nbdfuse support
+	optdepends = ocaml: For OCaml bindings
+	optdepends = python>=3: For Python bindings
+	source = https://download.libguestfs.org/libnbd/1.20-stable/libnbd-1.20.0.tar.gz
+	source = https://download.libguestfs.org/libnbd/1.20-stable/libnbd-1.20.0.tar.gz.sig
 	validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
-	sha256sums = b2b272777d9e088b61a2772f33d25010a09610e671c5cdd89ed695e00cbc919f
+	sha256sums = 21680ad26b1cccfeb47257c2eae8bfeaea7dfc11fdea723cce02f1a8e769353a
 	sha256sums = SKIP
 
 pkgname = libnbd
diff --git a/libnbd/.nvchecker.toml b/libnbd/.nvchecker.toml
new file mode 100644
index 0000000000..c8605d646d
--- /dev/null
+++ b/libnbd/.nvchecker.toml
@@ -0,0 +1,6 @@
+[libnbd]
+source = "git"
+git = "https://gitlab.com/nbdkit/libnbd"
+# only even minor versions are considered stable, because semver doesn't exist
+include_regex = "^(v|)([\\d.]+).([\\d]*)[02468]{1}.([\\d.]+)$"
+prefix = "v"
diff --git a/libnbd/PKGBUILD b/libnbd/PKGBUILD
index 3f351bf64b..9e55bb703d 100644
--- a/libnbd/PKGBUILD
+++ b/libnbd/PKGBUILD
@@ -2,33 +2,32 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro@archlinux.org>
 # Contributor: Thomas Weißschuh <thomas t-8ch de>
 pkgname=libnbd
-pkgver=1.20.0
-pkgrel=2.1
+pkgver=1.21.3
+pkgrel=1
 pkgdesc="NBD client library in userspace"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://gitlab.com/nbdkit/libnbd"
 license=('LGPL-2.1-or-later')
 depends=('glibc' 'gnutls' 'libxml2')
-makedepends=('perl' 'ocamlbuild' 'ocaml-findlib' 'rust' 'fuse3' 'python' 'go')
+makedepends=('perl' 'ocamlbuild' 'ocaml-findlib' 'rust' 'fuse3' 'python' 'git' 'go')
 optdepends=(
   'fuse3: For nbdfuse support'
   'ocaml: For OCaml bindings'
   'python>=3: For Python bindings'
 )
 source=(
-  "https://download.libguestfs.org/libnbd/${pkgver%.*}-stable/libnbd-${pkgver}.tar.gz"{,.sig}
+  "git+https://gitlab.com/nbdkit/libnbd.git#tag=v${pkgver}"
 )
-sha256sums=('21680ad26b1cccfeb47257c2eae8bfeaea7dfc11fdea723cce02f1a8e769353a'
-            'SKIP')
+sha256sums=('7a18e913de790c15a4a7bda4a3512df3b6a1285c6803387b54fb35eb7d566f21')
 validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0')  # Richard W.M. Jones <rjones@redhat.com>
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   autoreconf -fiv
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   export CFLAGS+=" -ffat-lto-objects"
 
   case "${CARCH}" in
@@ -42,11 +41,11 @@ build() {
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   make check
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   make DESTDIR="$pkgdir" install
 }