diff --git a/gi-docgen/trunk/PKGBUILD b/gi-docgen/trunk/PKGBUILD
index b1d050d..d583206 100644
--- a/gi-docgen/trunk/PKGBUILD
+++ b/gi-docgen/trunk/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgname=gi-docgen
-pkgver=2021.2+113+gc633261
+pkgver=2021.6
 pkgrel=1
 pkgdesc="Documentation generator for GObject-based libraries"
-url="https://gitlab.gnome.org/GNOME/gi-docgen"
+url="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
 arch=(any)
 license=(Apache GPL3)
 depends=(python-jinja python-markdown python-markupsafe python-pygments
          python-toml python-typogrify)
 makedepends=(python-setuptools git)
-_commit=c6332610a09612d91f41d32cac5f7cdf758694a7  # main
-source=("git+$url.git#commit=$_commit")
+_commit=cb76996ba9ef7a1634ab9bde30c77c3bbb47c8db  # tags/2021.6^0
+source=("git+https://gitlab.gnome.org/GNOME/gi-docgen.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -32,3 +32,5 @@ package() {
   cd $pkgname
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }
+
+# vim:set sw=2 et:
diff --git a/gi-docgen/x86_64/extra/PKGBUILD b/gi-docgen/x86_64/extra/PKGBUILD
index b1d050d..d583206 100644
--- a/gi-docgen/x86_64/extra/PKGBUILD
+++ b/gi-docgen/x86_64/extra/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgname=gi-docgen
-pkgver=2021.2+113+gc633261
+pkgver=2021.6
 pkgrel=1
 pkgdesc="Documentation generator for GObject-based libraries"
-url="https://gitlab.gnome.org/GNOME/gi-docgen"
+url="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
 arch=(any)
 license=(Apache GPL3)
 depends=(python-jinja python-markdown python-markupsafe python-pygments
          python-toml python-typogrify)
 makedepends=(python-setuptools git)
-_commit=c6332610a09612d91f41d32cac5f7cdf758694a7  # main
-source=("git+$url.git#commit=$_commit")
+_commit=cb76996ba9ef7a1634ab9bde30c77c3bbb47c8db  # tags/2021.6^0
+source=("git+https://gitlab.gnome.org/GNOME/gi-docgen.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -32,3 +32,5 @@ package() {
   cd $pkgname
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }
+
+# vim:set sw=2 et: