diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index b037e6032..f46d0a872 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.2
+DISTVERSION=	1.15.4
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index c58513821..e5ceb3c02 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630697036
-SHA256 (gitea-src-1.15.2.tar.gz) = cef589d50f27270e218cf7819ee569ae39f6352945c2fe01c2d1f08301c7bd22
-SIZE (gitea-src-1.15.2.tar.gz) = 48648887
+TIMESTAMP = 1633872316
+SHA256 (gitea-src-1.15.4.tar.gz) = 52c69303a6c8e69af7bdbbcede3167f00f2a5518b7f397db889403d3d52dfd7d
+SIZE (gitea-src-1.15.4.tar.gz) = 48693539
diff --git a/www/gitea/pkg-message b/www/gitea/pkg-message
index 02fcda138..80a8cb368 100644
--- a/www/gitea/pkg-message
+++ b/www/gitea/pkg-message
@@ -17,4 +17,14 @@ the documentation at https://docs.gitea.io/en-us/customizing-gitea/ and
 the release notes.
 EOM
 }
+{ type: upgrade
+  maximum_version: 1.15.1
+  message: <<EOM
+We remind users that a bug was discovered with gitea dump in 1.14.3–1.14.6
+and 1.15.0.  Database dumps from these versions cause broken fields in the
+repo_unit and login_source tables causing the issue identified in #16961. 
+Users on 1.14.x must upgrade to 1.14.7 before running gitea dump.  See the
+release notes for more information.
+EOM
+}
 ]