diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile
index 5c15785b030e..bf7f450bd44c 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.2.4625
-DISTVERSIONSUFFIX=a83d2d0f9
+PORTVERSION=	1.23.2.4656
+DISTVERSIONSUFFIX=85f0adf5b
 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 59ede19313e7..2bf94dca1d57 100644
--- a/multimedia/plexmediaserver-plexpass/distinfo
+++ b/multimedia/plexmediaserver-plexpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622648781
-SHA256 (PlexMediaServer-1.23.2.4625-a83d2d0f9-FreeBSD-amd64.tar.bz2) = 22ba040a16a71078a428368dc476ffe0998c7eadbb6fded8f610a65053e758b6
-SIZE (PlexMediaServer-1.23.2.4625-a83d2d0f9-FreeBSD-amd64.tar.bz2) = 99277840
+TIMESTAMP = 1623363842
+SHA256 (PlexMediaServer-1.23.2.4656-85f0adf5b-FreeBSD-amd64.tar.bz2) = ad2d4c2d849e85f79af9e1873bb57ed9ca7422bbf8de381341792e5fa42a9003
+SIZE (PlexMediaServer-1.23.2.4656-85f0adf5b-FreeBSD-amd64.tar.bz2) = 99007809
diff --git a/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in b/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
index 40962f1bfbf3..11772a044b3b 100644
--- a/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
+++ b/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
@@ -1,100 +1,101 @@
 #!/bin/sh
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 
 # PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable the Plex Media Server:
 #
 # %%PORTNAME%%_enable="YES"
 #
 # %%PORTNAME%%_support_path="%%PREFIX%%/plexdata" # Plex data: logs, media metadata, settings, etc
 #
 # %%PORTNAME%%_tmp="/var/tmp/plex" # configure tmp directory used for the transcoding process if desired
 #
 # %%PORTNAME%%_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases.
 #
 
 . /etc/rc.subr
 
 name=%%PORTNAME%%
 rcvar=%%PORTNAME%%_enable
 load_rc_config $name
 
 : ${%%PORTNAME%%_enable:=NO}
 : ${%%PORTNAME%%_support_path="%%PREFIX%%/plexdata-plexpass"}
 : ${%%PORTNAME%%_user="%%USERS%%"}
 : ${%%PORTNAME%%_group="%%GROUPS%%"}
 : ${%%PORTNAME%%_maxplugins=6}
 
 command=/usr/sbin/daemon
 procname="%%DATADIR%%/Plex_Media_Server"
 command_args="-f ${procname}"
 pidfile=/var/run/plex/plex.pid
 start_precmd=plex_precmd
 stop_precmd=plex_stop_precmd
 stop_postcmd=plex_stop_postcmd
 
 plex_precmd()
 {
 	#Set identification variables for FreeNAS; with fallback to FreeBSD
 	if [ -f "/etc/version" ]; then
 	  export PLEX_MEDIA_SERVER_INFO_VENDOR="$(cat /etc/version|cut -d- -f1)"
 	  export PLEX_MEDIA_SERVER_INFO_DEVICE=NAS
 	  export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"
 	  export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(cat /etc/version|cut -d- -f2-)"
 	else
 	  export PLEX_MEDIA_SERVER_INFO_VENDOR=FreeBSD
 	  export PLEX_MEDIA_SERVER_INFO_DEVICE=PC
 	  export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"
 	  export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(uname -r)"
 	fi
 	export SUPPORT_PATH="${%%PORTNAME%%_support_path}"
 	export HOME="${%%PORTNAME%%_support_path}/Plex Media Server"
 	export PYTHONHOME="%%DATADIR%%/Resources/Python"
 	export SCRIPTPATH="%%DATADIR%%"
+	export LD_LIBRARY_PATH="${SCRIPTPATH}/lib"
 	export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}"
 	export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${%%PORTNAME%%_maxplugins}
 	export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${%%PORTNAME%%_support_path}
 	export PLEX_MEDIA_SERVER_PIDFILE=${pidfile}
 	export PLEX_MEDIA_SERVER_LOG_DIR="${%%PORTNAME%%_support_path}/Plex Media Server/Logs"
 	export PATH="${SCRIPTPATH}/Resources/Python/bin:${PATH}"
 	export LC_ALL="en_US.UTF-8"
 	export LANG="en_US.UTF-8"
 	ulimit -s 3000
 
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${%%PORTNAME%%_user} ${pidfile%/*};
 	fi
 	
 	if [ ! -d "${%%PORTNAME%%_support_path}/Plex Media Server" ]; then
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex Media Server";
 	fi
 
 	if [ ! -d "${%%PORTNAME%%_support_path}/Plex" ]; then
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex";
 	fi
 	
 	if [ ${%%PORTNAME%%_tmp} ]; then 
 		export TMPDIR=${%%PORTNAME%%_tmp};
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_tmp}";
 	fi
 }
 
 plex_stop_precmd()
 {
 	if [ -r ${pidfile} ]; then
 		export _PLEXPID=$(check_pidfile ${pidfile} ${procname})
 	fi
 }
 
 plex_stop_postcmd()
 {
 	_PLEX_CHILDREN=$(pgrep -g ${_PLEXPID})
 	echo "Cleaning up leftover child processes."
 	kill -9 ${_PLEX_CHILDREN}
 	wait_for_pids ${_PLEX_CHILDREN}
 }
 
 run_rc_command "$1"
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index 94d71798ce32..7a6d730def65 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.2.4625
-DISTVERSIONSUFFIX?=a83d2d0f9
+PORTVERSION?=	1.23.2.4656
+DISTVERSIONSUFFIX?=85f0adf5b
 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 cbc1d8b37441..10d52bdfeb43 100644
--- a/multimedia/plexmediaserver/distinfo
+++ b/multimedia/plexmediaserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622648766
-SHA256 (PlexMediaServer-1.23.2.4625-a83d2d0f9-FreeBSD-amd64.tar.bz2) = 22ba040a16a71078a428368dc476ffe0998c7eadbb6fded8f610a65053e758b6
-SIZE (PlexMediaServer-1.23.2.4625-a83d2d0f9-FreeBSD-amd64.tar.bz2) = 99277840
+TIMESTAMP = 1623363987
+SHA256 (PlexMediaServer-1.23.2.4656-85f0adf5b-FreeBSD-amd64.tar.bz2) = ad2d4c2d849e85f79af9e1873bb57ed9ca7422bbf8de381341792e5fa42a9003
+SIZE (PlexMediaServer-1.23.2.4656-85f0adf5b-FreeBSD-amd64.tar.bz2) = 99007809
diff --git a/multimedia/plexmediaserver/files/plexmediaserver.in b/multimedia/plexmediaserver/files/plexmediaserver.in
index 6a587e8d4050..b88d77e78b06 100644
--- a/multimedia/plexmediaserver/files/plexmediaserver.in
+++ b/multimedia/plexmediaserver/files/plexmediaserver.in
@@ -1,100 +1,101 @@
 #!/bin/sh
 # Created by: KalleDK <plexmaintainer@k-moeller.dk>
 
 # PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable the Plex Media Server:
 #
 # %%PORTNAME%%_enable="YES"
 #
 # %%PORTNAME%%_support_path="%%PREFIX%%/plexdata" # Plex data: logs, media metadata, settings, etc
 #
 # %%PORTNAME%%_tmp="/var/tmp/plex" # configure tmp directory used for the transcoding process if desired
 #
 # %%PORTNAME%%_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases.
 #
 
 . /etc/rc.subr
 
 name=%%PORTNAME%%
 rcvar=%%PORTNAME%%_enable
 load_rc_config $name
 
 : ${%%PORTNAME%%_enable:=NO}
 : ${%%PORTNAME%%_support_path="%%PREFIX%%/plexdata"}
 : ${%%PORTNAME%%_user="%%USERS%%"}
 : ${%%PORTNAME%%_group="%%GROUPS%%"}
 : ${%%PORTNAME%%_maxplugins=6}
 
 command=/usr/sbin/daemon
 procname="%%DATADIR%%/Plex_Media_Server"
 command_args="-f ${procname}"
 pidfile=/var/run/plex/plex.pid
 start_precmd=plex_precmd
 stop_precmd=plex_stop_precmd
 stop_postcmd=plex_stop_postcmd
 
 plex_precmd()
 {
 	#Set identification variables for FreeNAS; with fallback to FreeBSD
 	if [ -f "/etc/version" ]; then
 	  export PLEX_MEDIA_SERVER_INFO_VENDOR="$(cat /etc/version|cut -d- -f1)"
 	  export PLEX_MEDIA_SERVER_INFO_DEVICE=NAS
 	  export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"
 	  export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(cat /etc/version|cut -d- -f2-)"
 	else
 	  export PLEX_MEDIA_SERVER_INFO_VENDOR=FreeBSD
 	  export PLEX_MEDIA_SERVER_INFO_DEVICE=PC
 	  export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"
 	  export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(uname -r)"
 	fi
 	export SUPPORT_PATH="${%%PORTNAME%%_support_path}"
 	export HOME="${%%PORTNAME%%_support_path}/Plex Media Server"
 	export PYTHONHOME="%%DATADIR%%/Resources/Python"
 	export SCRIPTPATH="%%DATADIR%%"
+	export LD_LIBRARY_PATH="${SCRIPTPATH}/lib"
 	export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}"
 	export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${%%PORTNAME%%_maxplugins}
 	export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${%%PORTNAME%%_support_path}
 	export PLEX_MEDIA_SERVER_PIDFILE=${pidfile}
 	export PLEX_MEDIA_SERVER_LOG_DIR="${%%PORTNAME%%_support_path}/Plex Media Server/Logs"
 	export PATH="${SCRIPTPATH}/Resources/Python/bin:${PATH}"
 	export LC_ALL="en_US.UTF-8"
 	export LANG="en_US.UTF-8"
 	ulimit -s 3000
 
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${%%PORTNAME%%_user} ${pidfile%/*};
 	fi
 	
 	if [ ! -d "${%%PORTNAME%%_support_path}/Plex Media Server" ]; then
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex Media Server";
 	fi
 
 	if [ ! -d "${%%PORTNAME%%_support_path}/Plex" ]; then
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex";
 	fi
 	
 	if [ ${%%PORTNAME%%_tmp} ]; then 
 		export TMPDIR=${%%PORTNAME%%_tmp};
 		install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_tmp}";
 	fi
 }
 
 plex_stop_precmd()
 {
 	if [ -r ${pidfile} ]; then
 		export _PLEXPID=$(check_pidfile ${pidfile} ${procname})
 	fi
 }
 
 plex_stop_postcmd()
 {
 	_PLEX_CHILDREN=$(pgrep -g ${_PLEXPID})
 	echo "Cleaning up leftover child processes."
 	kill -9 ${_PLEX_CHILDREN}
 	wait_for_pids ${_PLEX_CHILDREN}
 }
 
 run_rc_command "$1"