diff --git a/community/gitea/PKGBUILD b/community/gitea/PKGBUILD
index de7f205f6..1f0e1301e 100644
--- a/community/gitea/PKGBUILD
+++ b/community/gitea/PKGBUILD
@@ -9,7 +9,7 @@
 #  - don't check repo signature until author puts his keys on keyservers
 
 pkgname=gitea
-pkgver=1.15.11
+pkgver=1.16.4
 pkgrel=1
 pkgdesc="Painless self-hosted Git service, community managed."
 arch=(x86_64)
@@ -26,8 +26,9 @@ optdepends=(
   'redis: Redis support'
   'sqlite: SQLite support'
 )
+checkdepends=(openssh)
 options=(!lto)
-_tag=594bdebf077a37c939896eea3f446954f4546c2c # git rev-parse v${pkgver}
+_tag=8e2d483f4a56fdc5a44630c72954d1abfef2f125 # git rev-parse v${pkgver}
 source=("git+https://github.com/go-gitea/gitea.git#tag=${_tag}"
         gitea.tmpfiles
         gitea.service
@@ -48,17 +49,17 @@ validpgpkeys=(
 )
 install=gitea.install
 
-prepare() {
-  cd ${pkgname}
-  # Fetch dependency using go mod
-  make vendor
-}
-
 pkgver() {
   cd ${pkgname}
   git describe --tags | sed 's/^v//'
 }
 
+prepare() {
+  cd ${pkgname}
+  git cherry-pick -n 9bcbbd419fba4fc9eed724746a42e22028d47625
+  make deps
+}
+
 build() {
   cd ${pkgname}
   export GOGC=50
@@ -74,6 +75,11 @@ build() {
   make -j1
 }
 
+check() {
+  cd ${pkgname}
+  make test
+}
+
 package() {
   install -Dm755 ${pkgname}/${pkgname} -t "${pkgdir}"/usr/bin/
   install -Dm644 ${pkgname}/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/