diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 3df2c6e9c41e..f46d0a872c29 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.3
+DISTVERSION=	1.15.4
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
 
 MAINTAINER=	stb@lassitu.de
 COMMENT=	Compact self-hosted Git service
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:no_targets
 USE_RC_SUBR=	gitea
 
 SUB_FILES+=	app.ini.sample
 SUB_LIST+=	GITUSER=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 PORTDATA=	*
 
 OPTIONS_DEFINE=	BINDATA GIT_LFS PAM SQLITE
 OPTIONS_DEFAULT=	GIT_LFS PAM SQLITE
 OPTIONS_SUB=	yes
 
 BINDATA_DESC=	Build a single monolithic binary, with all assets included
 GIT_LFS_DESC=	Support for Git Large File Storage (LFS)
 PAM_DESC=	Enable support for PAM
 
 BINDATA_VARS=	GO_TAGS+=bindata
 GIT_LFS_RUN_DEPENDS=	git-lfs:devel/git-lfs
 PAM_VARS=	GO_TAGS+=pam
 SQLITE_VARS=	GO_TAGS+="sqlite sqlite_unlock_notify"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 DAEMONARGS=	-S -l \$${gitea_facility} -s \$${gitea_priority} -T \$${name}
 .else
 DAEMONARGS=	-f
 .endif
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 SSP_UNSAFE=	true
 # Default LDFLAGS are incompatible with build
 MAKE_ENV=	LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
 MAKE_ARGS=	GOPATH=${WRKDIR} TAGS="${GO_TAGS}"
 ALL_TARGET=	backend
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION
 
 # Too lazy to figure out why go install won't work.
 do-install:
 	# Go binary is statically linked and cannot be stripped, so use
 	# INSTALL_SCRIPT.
 	${INSTALL_SCRIPT} ${WRKSRC}/gitea ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index 0b425fb4b93e..c306e7e5a43d 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632328620
-SHA256 (gitea-src-1.15.3.tar.gz) = afc14ff631080a18385c36f4005f6b8900693425667dfad5234cb323cdeac00d
-SIZE (gitea-src-1.15.3.tar.gz) = 48671233
+TIMESTAMP = 1633967425
+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 02fcda1382d1..7f100837b709 100644
--- a/www/gitea/pkg-message
+++ b/www/gitea/pkg-message
@@ -1,20 +1,30 @@
 [
 { type: upgrade
   maximum_version: 1.7.6
   message: <<EOM
 When upgrading from Gitea 1.7 or earlier, Gitea requires the addition of
 another secret to the config file in order to start up.  Either manually add
 JWT_SECRET to the ${PREFIX}/etc/gitea/conf/app.ini config file (see
 app.ini.sample), or allow Gitea to make the change for you by making the
 config file writable to the git user.
 EOM
 }
 { type: upgrade
   maximum_version: 1.15.0
   message: <<EOM
 Some config file options have been changed in Gitea 1.15. Please refer to
 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
+}
 ]