diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
index 37378693eec1..82959db8b8b3 100644
--- a/net/tigervnc-server/Makefile
+++ b/net/tigervnc-server/Makefile
@@ -14,12 +14,14 @@ LIB_DEPENDS=	libxshmfence.so:x11/libxshmfence
 RUN_DEPENDS+=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp
 
-USES+=		autoreconf:build compiler:c11 gl jpeg libtool pkgconfig ssl xorg
+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_LANG=	bash
+SHEBANG_FILES=	unix/vncserver/vncsession-start.in
 BINARY_WRAPPERS=	gm4
 
 OPTIONS_DEFINE=	DOCS GNUTLS PAM
diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk
index 12dd0d4eff29..e5e1f66abd32 100644
--- a/net/tigervnc-server/Makefile.common.mk
+++ b/net/tigervnc-server/Makefile.common.mk
@@ -2,8 +2,7 @@
 
 PORTNAME=	tigervnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.1
-PORTREVISION=	1
+DISTVERSION=	1.11.0
 CATEGORIES=	net x11-servers
 
 MAINTAINER?=	meta@FreeBSD.org
@@ -18,7 +17,7 @@ GH_ACCOUNT=	TigerVNC
 CONFLICTS=	tightvnc-[0-9]*
 PLIST_SUB+=	TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}-
 
-CMAKE_ARGS+=	-G "Unix Makefiles"
+CMAKE_ARGS+=	-G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false
 MAKE_ARGS+=	TIGERVNC_SRCDIR=${WRKSRC}
 
 DOCS=	LICENCE.TXT README.rst
diff --git a/net/tigervnc-server/distinfo b/net/tigervnc-server/distinfo
index 56e9b9b04ca5..4be9d20fab3f 100644
--- a/net/tigervnc-server/distinfo
+++ b/net/tigervnc-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577061858
-SHA256 (TigerVNC-tigervnc-v1.10.1_GH0.tar.gz) = 19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
-SIZE (TigerVNC-tigervnc-v1.10.1_GH0.tar.gz) = 1408105
+TIMESTAMP = 1600214302
+SHA256 (TigerVNC-tigervnc-v1.11.0_GH0.tar.gz) = 3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3
+SIZE (TigerVNC-tigervnc-v1.11.0_GH0.tar.gz) = 1346992
diff --git a/net/tigervnc-server/files/patch-CMakeLists.txt b/net/tigervnc-server/files/patch-CMakeLists.txt
deleted file mode 100644
index c1e2c6ba7fec..000000000000
--- a/net/tigervnc-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2018-07-16 14:08:55 UTC
-+++ CMakeLists.txt
-@@ -29,7 +29,7 @@ set(RCVERSION 1,9,0,0)
- # Installation paths
- set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
--set(MAN_DIR "${DATA_DIR}/man")
-+set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
- set(LOCALE_DIR "${DATA_DIR}/locale")
- set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
- 
diff --git a/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake b/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake
deleted file mode 100644
index 7e1973ac3593..000000000000
--- a/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
---- cmake/BuildPackages.cmake.orig	2018-07-16 14:08:55 UTC
-+++ cmake/BuildPackages.cmake
-@@ -86,5 +86,3 @@ endif() #UNIX
- # Common
- #
- 
--install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${DOC_DIR})
--install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${DOC_DIR})
diff --git a/net/tigervnc-server/files/patch-release_CMakeLists.txt b/net/tigervnc-server/files/patch-release_CMakeLists.txt
new file mode 100644
index 000000000000..cd8a343b5657
--- /dev/null
+++ b/net/tigervnc-server/files/patch-release_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- release/CMakeLists.txt.orig	2018-07-16 14:08:55 UTC
++++ release/CMakeLists.txt
+@@ -86,5 +86,3 @@ endif() #UNIX
+ # Common
+ #
+ 
+-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR})
+-install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR})
diff --git a/net/tigervnc-server/files/patch-unix_vncserver b/net/tigervnc-server/files/patch-unix_vncserver
deleted file mode 100644
index ed513542e04e..000000000000
--- a/net/tigervnc-server/files/patch-unix_vncserver
+++ /dev/null
@@ -1,20 +0,0 @@
---- unix/vncserver.orig	2017-05-16 13:53:28 UTC
-+++ unix/vncserver
-@@ -532,7 +532,7 @@ sub CheckDisplayNumber
- 
-     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
-     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
--    if (!bind(S, pack('S n x12', $AF_INET, 6000 + $n))) {
-+    if (!bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) {
- 	close(S);
- 	return 0;
-     }
-@@ -540,7 +540,7 @@ sub CheckDisplayNumber
- 
-     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
-     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
--    if (!bind(S, pack('S n x12', $AF_INET, 5900 + $n))) {
-+    if (!bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) {
- 	close(S);
- 	return 0;
-     }
diff --git a/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c b/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c
new file mode 100644
index 000000000000..c55fe796e50b
--- /dev/null
+++ b/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c
@@ -0,0 +1,13 @@
+diff --git unix/vncserver/vncsession.c unix/vncserver/vncsession.c
+index 3e0c98f0..cdac9d1a 100644
+--- unix/vncserver/vncsession.c
++++ unix/vncserver/vncsession.c
+@@ -339,7 +339,7 @@ static void
+ redir_stdio(const char *homedir, const char *display)
+ {
+     int fd;
+-    char hostname[HOST_NAME_MAX+1];
++    char hostname[_SC_HOST_NAME_MAX+1];
+     char logfile[PATH_MAX];
+ 
+     fd = open("/dev/null", O_RDONLY);
diff --git a/net/tigervnc-server/pkg-plist b/net/tigervnc-server/pkg-plist
index 6d1605a4f24a..f9f424fb69ff 100644
--- a/net/tigervnc-server/pkg-plist
+++ b/net/tigervnc-server/pkg-plist
@@ -1,13 +1,19 @@
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd
-bin/vncserver
 bin/x0vncserver
+sbin/vncsession
+etc/pam.d/tigervnc
+%%ETCDIR%%/vncserver-config-defaults
+%%ETCDIR%%/vncserver-config-mandatory
+%%ETCDIR%%/vncserver.users
 lib/xorg/modules/extensions/libvnc.so
+libexec/vncserver
 man/man1/Xvnc.1.gz
 man/man1/vncconfig.1.gz
 man/man1/vncpasswd.1.gz
-man/man1/vncserver.1.gz
 man/man1/x0vncserver.1.gz
+man/man8/vncserver.8.gz
+man/man8/vncsession.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%LICENCE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%README.rst
diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile
index f77e00ece954..ba6359446c1b 100644
--- a/net/tigervnc-viewer/Makefile
+++ b/net/tigervnc-viewer/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	net
 COMMENT=	TigerVNC Viewer
 
 USES+=		gnome iconv jpeg xorg
-USE_XORG+=	ice sm x11 xcursor xext xfixes xft xinerama xrender
+USE_XORG+=	ice pixman sm x11 xcursor xext xfixes xft xi xinerama xrender
 
 BUILD_DEPENDS+=	convert:graphics/ImageMagick7 # to generate icons during build
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \