diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
index 16afa4f2aa8d..1bd059a882f4 100644
--- a/net/tigervnc-server/Makefile
+++ b/net/tigervnc-server/Makefile
@@ -1,118 +1,117 @@
-PORTREVISION=	1
 PKGNAMESUFFIX=	-server
 
 COMMENT=	TigerVNC Server
 WWW=		https://tigervnc.org/
 
 PATCH_DEPENDS+=	${NONEXISTENT}:x11-servers/xorg-server:patch
 BUILD_DEPENDS+=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
 		bash:shells/bash
 LIB_DEPENDS=	libxshmfence.so:x11/libxshmfence \
 		libxcvt.so:x11/libxcvt \
 		libnettle.so:security/nettle \
 		libgmp.so:math/gmp
 # almost equivalent to x11-servers/xorg-server's
 RUN_DEPENDS+=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp
 
 USES+=		autoreconf:build compiler:c11 gl jpeg libtool pkgconfig ssl shebangfix xorg
 USE_LDCONFIG=	yes
 USE_GL+=	gl
 USE_XORG+=	ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \
 		xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst
 
 SHEBANG_FILES=	unix/vncserver/vncsession-start.in
 BINARY_WRAPPERS=	gm4
 
 OPTIONS_DEFINE=	DOCS GNUTLS PAM
 OPTIONS_DEFAULT=	GNUTLS PAM
 OPTIONS_SUB=	yes
 GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
 GNUTLS_CONFIGURE_ARGS=	--enable-glx-tls
 GNUTLS_LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error \
 			libgnutls.so:security/gnutls
 PAM_CMAKE_BOOL=	ENABLE_PAM
 
 CONFIGURE_ARGS+=	\
 		--prefix=${PREFIX} --mandir=${MANPREFIX}/share/man \
 		--docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \
 		--disable-static --disable-dri --disable-unit-tests \
 		--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
 		--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 		--disable-config-dbus --disable-config-hal \
 		--disable-dri2 --enable-install-libxf86config --enable-glx \
 		--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 		--with-xkb-bin-directory=${LOCALBASE}/bin \
 		--with-serverconfig-path=${LOCALBASE}/lib/X11 \
 		--disable-selective-werror \
 		--disable-xwayland \
 		--with-fontrootdir=${LOCALBASE}/share/fonts
 
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/  \
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 CONFIGURE_ARGS+=	--with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}"
 
 CFLAGS+=	-I${LOCALBASE}/include/libdrm
 
 # This is server port, disabling some features
 # - disable vncviewer
 # - server is not internationalized
 CMAKE_ARGS+=	-DBUILD_VIEWER:BOOL=false -DENABLE_NLS:BOOL=false
 
 TIGERVNC_XORG_PATCH_VER=	${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g
 XORG_WRKSRC=	${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC
 
 pre-patch:
 	${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/
 	# workaround: upstream changed patch naming
 	${LN} -sf ${WRKSRC}/unix/xserver21.1.1.patch ${WRKSRC}/unix/xserver211.patch
 
 post-patch:
 	# do not build tests
 	${REINPLACE_CMD} -e 's|add_subdirectory(tests)||' ${WRKSRC}/CMakeLists.txt
 	cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver$$(${TIGERVNC_XORG_PATCH_VER}).patch
 
 post-configure:
 	cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${AUTORECONF} -fiv
 	cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS}
 
 post-build:
 	cd ${WRKSRC}/unix/xserver/ && \
 	    ${DO_MAKE_BUILD} SHELL=${LOCALBASE}/bin/bash ${ALL_TARGET}
 
 post-stage:
 	# Install v1.10.0 vncserver script and manpage.
 	# See: https://cgit.freebsd.org/ports/commit/net/tigervnc-server?id=e6d3d07
 	${INSTALL_SCRIPT} ${FILESDIR}/v1.10.0-vncserver ${STAGEDIR}${PREFIX}/bin/vncserver
 	${INSTALL_MAN} ${FILESDIR}/v1.10.0-vncserver.man ${STAGEDIR}${MANPREFIX}/share/man/man8/vncserver.8
 
 post-install:
 	cd ${WRKSRC}/unix/xserver/hw/vnc/ && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-strip
 
 .include "${.CURDIR}/Makefile.common.mk"
 
 # import from x11-server/xorg-server/Makefile
 .if ${SSL_DEFAULT} == base
 # The reason why I use this is cause openssl from base doesn't
 # install a .pc file and configure will fail trying to find it.
 # Setting both of those variables to a *non-empty* value by-passes
 # the pkg-config check.
 CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk
index 3c21192f0c3c..0dcb4abe7c15 100644
--- a/net/tigervnc-server/Makefile.common.mk
+++ b/net/tigervnc-server/Makefile.common.mk
@@ -1,33 +1,33 @@
 PORTNAME=	tigervnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.13.0
+DISTVERSION=	1.13.1
 CATEGORIES=	net x11-servers
 
 MAINTAINER?=	meta@FreeBSD.org
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENCE.TXT
 
 USES+=		cmake:insource,noninja cpe
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	TigerVNC
 CONFLICTS=	tightvnc
 PLIST_SUB+=	TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}-
 
 CMAKE_ARGS+=	-G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false
 MAKE_ARGS+=	TIGERVNC_SRCDIR=${WRKSRC}
 
 DOCS=	LICENCE.TXT README.rst
 
 .include <bsd.port.pre.mk>
 
 PLIST=	${.CURDIR}/pkg-plist
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}/${PORTNAME}${PKGNAMESUFFIX}-${f})
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/tigervnc-server/distinfo b/net/tigervnc-server/distinfo
index 065b3d863d36..b60061a5e3b7 100644
--- a/net/tigervnc-server/distinfo
+++ b/net/tigervnc-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675905528
-SHA256 (TigerVNC-tigervnc-v1.13.0_GH0.tar.gz) = 770e272f5fcd265a7c518f9a38b3bece1cf91e0f4e5e8d01f095b5e58c6f9c40
-SIZE (TigerVNC-tigervnc-v1.13.0_GH0.tar.gz) = 1986759
+TIMESTAMP = 1678235423
+SHA256 (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = b7c5b8ed9e4e2c2f48c7b2c9f21927db345e542243b4be88e066b2daa3d1ae25
+SIZE (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = 1989081
diff --git a/net/tigervnc-viewer-java/Makefile b/net/tigervnc-viewer-java/Makefile
index 7d52fa24519b..0a9ae19cc674 100644
--- a/net/tigervnc-viewer-java/Makefile
+++ b/net/tigervnc-viewer-java/Makefile
@@ -1,41 +1,43 @@
 PKGNAMESUFFIX=	-viewer-java
 CATEGORIES=	net java
 
 COMMENT=	TigerVNC Viewer
 WWW=		https://tigervnc.org/
 
 USES+=		jpeg xorg
 USE_XORG+=	pixman
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 
+NO_ARCH=	yes
+
 CMAKE_ARGS+=	-DBUILD_JAVA:BOOL=true \
 		-DBUILD_VIEWER:BOOL=false \
 		-DENABLE_NLS:BOOL=false
 
 DESKTOP_ENTRIES=	"TigerVNC viewer (Java version)" "Connect to VNC server and display remote desktop" \
 				"${PORTNAME}" "vncviewer-java" "Network;" false
 
 DESCR=		${.CURDIR}/pkg-descr
 FILESDIR=	${.CURDIR}/files
 
 JARFILES=	VncViewer.jar
 PLIST_FILES=	${JARFILES:S,^,${JAVAJARDIR}/,} \
 		bin/vncviewer-java
 SUB_LIST=	JAVAJARDIR="${JAVAJARDIR}"
 SUB_FILES=	vncviewer-java
 
 post-patch:
 	# do not build server components and tests
 	@${REINPLACE_CMD} \
 		-e 's|add_subdirectory(unix)||' \
 		-e 's|add_subdirectory(tests)||' \
 		${WRKSRC}/CMakeLists.txt
 
 do-install:
 	 ${INSTALL_DATA} ${WRKSRC}/java/VncViewer.jar ${STAGEDIR}${JAVAJARDIR}/
 	 ${INSTALL_SCRIPT} ${WRKDIR}/vncviewer-java ${STAGEDIR}${PREFIX}/bin/
 
 MASTERDIR=	${.CURDIR}/../tigervnc-server
 
 .include "${MASTERDIR}/Makefile.common.mk"