diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index c4ccdfb46f3c..72f5b0e219c1 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	limesurvey
-PORTVERSION=	5.6.11
+PORTVERSION=	5.6.21
 CATEGORIES=	www
-MASTER_SITES=	http://download.limesurvey.org/latest-stable-release/
-DISTNAME=	${PORTNAME}${PORTVERSION}+230320
+MASTER_SITES=	http://download.limesurvey.org/latest-5.x/
+DISTNAME=	${PORTNAME}${PORTVERSION}+230518
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	PHP-based survey building and runing system
 WWW=		https://www.limesurvey.org/
 
 LICENSE=	GPLv2
 
 USES=		cpe php:web zip
 
 OPTIONS_DEFINE=		GD IMAP LDAP PGSQL
 OPTIONS_DEFAULT=	GD
 
 PGSQL_DESC=	Use PostgreSQL (instead of MySQL)
 GD_DESC=	Install PHP gd extension
 LDAP_DESC=	Install PHP LDAP extension
 IMAP_DESC=	Install PHP IMAP extension
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PHP=	pdo_pgsql
 .else
 # server is not necessary on this host.
 USE_PHP=	pdo_mysql
 .endif
 .if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 .if ${PORT_OPTIONS:MIMAP}
 USE_PHP+=	imap
 .endif
 USE_PHP+=	ctype dom iconv mbstring session \
 		simplexml xmlwriter zip zlib
 
 WWWDOCROOT?=		www
 PHPSURVEYORURL?=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PHPSURVEYORDIR="${PHPSURVEYORDIR}" \
 		PHPSURVEYORURL="${PHPSURVEYORURL}"
 
 PHPSURVEYORDIR=	${WWWDOCROOT}/${PHPSURVEYORURL}
 
 do-install:
 	${MKDIR} "${STAGEDIR}${WWWDIR}"
 	@cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}"
 	${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload
 	${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin
 
 post-install:
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type f -print | \
 		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
 	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type d -print | \
 		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${FIND} -s -d ${STAGEDIR}${WWWDIR} ! -path "${STAGEDIR}${WWWDIR}/admin/*" -type f -print | \
 		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
 	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d ! -path "${STAGEDIR}${WWWDIR}/admin*" -print | \
 		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/limesurvey/distinfo b/www/limesurvey/distinfo
index c453144e380b..c7a1f765fef7 100644
--- a/www/limesurvey/distinfo
+++ b/www/limesurvey/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679682090
-SHA256 (limesurvey5.6.11+230320.zip) = ae83fc1554da676f9913dd7764ad58c7e8297f644a3bbe9f9657391dfaf06466
-SIZE (limesurvey5.6.11+230320.zip) = 89306265
+TIMESTAMP = 1684700359
+SHA256 (limesurvey5.6.21+230518.zip) = 3506266825e98d8f83bed8ea64dd0243703f319f1f73139c0fd39f1effff796f
+SIZE (limesurvey5.6.21+230518.zip) = 89031757