diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile
index a309a6a25802..4dadf7c725c0 100644
--- a/multimedia/plexmediaserver-plexpass/Makefile
+++ b/multimedia/plexmediaserver-plexpass/Makefile
@@ -1,22 +1,22 @@
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 
-PORTVERSION=	1.23.4.4712
-DISTVERSIONSUFFIX=1f0ed4aea
+PORTVERSION=	1.23.6.4881
+DISTVERSIONSUFFIX=e2e58f321
 PORTREVISION=	0
 MASTER_SITES=	https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/
 PKGNAMESUFFIX=	-plexpass
 DISTNAME=	PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH}
 
 MAINTAINER=	feld@FreeBSD.org
 
 USE_RC_SUBR=	${PORTNAME}_plexpass
 
 MASTERDIR=${.CURDIR}/../plexmediaserver
 
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_LIST=	PORTNAME=${PORTNAME}_plexpass DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo
index da04cd91c88b..e1a6f93d4570 100644
--- a/multimedia/plexmediaserver-plexpass/distinfo
+++ b/multimedia/plexmediaserver-plexpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625086046
-SHA256 (PlexMediaServer-1.23.4.4712-1f0ed4aea-FreeBSD-amd64.tar.bz2) = d4155d57e23771bc32ad91d6c13bf7f2f9af3142263051525fce9e3302af0211
-SIZE (PlexMediaServer-1.23.4.4712-1f0ed4aea-FreeBSD-amd64.tar.bz2) = 99119838
+TIMESTAMP = 1627938195
+SHA256 (PlexMediaServer-1.23.6.4881-e2e58f321-FreeBSD-amd64.tar.bz2) = 0ca4619a5a3de9efb8c96f0779b3bc4f6b96805a02e2e12df25d31f327550b20
+SIZE (PlexMediaServer-1.23.6.4881-e2e58f321-FreeBSD-amd64.tar.bz2) = 99083690
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index 5d56c69ffb85..00fabc64b780 100644
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@@ -1,60 +1,60 @@
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 
 PORTNAME=	plexmediaserver
-PORTVERSION?=	1.23.3.4707
-DISTVERSIONSUFFIX?=ebb5fe9f3
+PORTVERSION?=	1.23.6.4881
+DISTVERSIONSUFFIX?=e2e58f321
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES?=	https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/
 DISTNAME?=	PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH}
 
 MAINTAINER?=	feld@FreeBSD.org
 COMMENT=	Plex Media Server component
 
 USES=		cpe tar:bzip2
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/PlexMediaServer-${PORTVERSION}-${DISTVERSIONSUFFIX}
 
 CPE_VENDOR=	plex
 CPE_PRODUCT=	plex_media_server
 CPE_VERSION=	${PORTVERSION:R}
 
 USE_RC_SUBR?=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST?=	PORTNAME=${PORTNAME} DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS}
 
 USERS=		plex
 GROUPS=		${USERS}
 BUNDLE_LIBS=	yes
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	binary-only program, source code not available
 
 OPTIONS_DEFINE=	RELAY
 OPTIONS_DEFAULT=	RELAY
 OPTIONS_SUB=	yes
 RELAY_DESC=	Install Plex Relay daemon
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	# binaries don't come pre-stripped
 	${FIND} ${WRKSRC}/Resources -type f -name '*.so' -exec ${STRIP_CMD} {} \+
 	${FIND} ${WRKSRC} ${WRKSRC}/Resources -type f -name 'Plex*' -depth 1 -exec ${STRIP_CMD} {} \+
 	${FIND} ${WRKSRC} -depth 1 -type f -name 'lib*' -exec ${STRIP_CMD} {} \+
 
 post-patch-RELAY-off:
 	${RM} ${WRKSRC}/Plex\ Relay
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR})
 	# Workaround for space in binary name
 	${INSTALL} -lrs ${STAGEDIR}/${DATADIR}/Plex\ Media\ Server ${STAGEDIR}/${DATADIR}/Plex_Media_Server
 
 post-install:
 	@${CHMOD} 555 ${STAGEDIR}/${DATADIR}/CrashUploader ${STAGEDIR}/${DATADIR}/Plex*
 	@${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo
index d90745c89df0..7be3f4533051 100644
--- a/multimedia/plexmediaserver/distinfo
+++ b/multimedia/plexmediaserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625085466
-SHA256 (PlexMediaServer-1.23.3.4707-ebb5fe9f3-FreeBSD-amd64.tar.bz2) = 183fb26bbf1b13d4c7d1fd939220419dca6091426d5f39dac7aedc41ce6699ed
-SIZE (PlexMediaServer-1.23.3.4707-ebb5fe9f3-FreeBSD-amd64.tar.bz2) = 99149296
+TIMESTAMP = 1627938084
+SHA256 (PlexMediaServer-1.23.6.4881-e2e58f321-FreeBSD-amd64.tar.bz2) = 0ca4619a5a3de9efb8c96f0779b3bc4f6b96805a02e2e12df25d31f327550b20
+SIZE (PlexMediaServer-1.23.6.4881-e2e58f321-FreeBSD-amd64.tar.bz2) = 99083690