diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile
index 9758c6e0f268..2fb0edee133a 100644
--- a/net/nxproxy/Makefile
+++ b/net/nxproxy/Makefile
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	nxproxy
-DISTVERSION=	3.5.0.33
+DISTVERSION=	3.5.99.20
+DISTVERSIONSUFFIX=	-1
 CATEGORIES=	net
 MASTER_SITES=	https://code.x2go.org/releases/source/nx-libs/
-DISTNAME=	nx-libs-${PORTVERSION}-lite
+DISTNAME=	nx-libs-${PORTVERSION}${DISTVERSIONSUFFIX}-lite
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper program for x2go
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libXcomp.so:x11/nxcomp
 
 USES=		autoreconf localbase:ldflags
 GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
+WRKSRC=		${WRKDIR}/nx-libs-${PORTVERSION}${DISTVERSIONSUFFIX}/${PORTNAME}
 
 PLIST_FILES=	bin/nxproxy \
 		man/man1/nxproxy.1.gz
diff --git a/net/nxproxy/distinfo b/net/nxproxy/distinfo
index 096c745a95e0..c33368580a7a 100644
--- a/net/nxproxy/distinfo
+++ b/net/nxproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518771541
-SHA256 (nx-libs-3.5.0.33-lite.tar.gz) = e43824f820f8d307207aa4686c68f9b0808909a6b6cd2c7d75b751b14dd3129f
-SIZE (nx-libs-3.5.0.33-lite.tar.gz) = 626306
+TIMESTAMP = 1573826701
+SHA256 (nx-libs-3.5.99.20-1-lite.tar.gz) = 6b934a98e6425b3790ab0fa56e6e1c7047e98ffdb381415afa755375ae1cb123
+SIZE (nx-libs-3.5.99.20-1-lite.tar.gz) = 757561
diff --git a/net/nxproxy/files/patch-configure.ac b/net/nxproxy/files/patch-configure.ac
new file mode 100644
index 000000000000..6681815bb578
--- /dev/null
+++ b/net/nxproxy/files/patch-configure.ac
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2019-11-16 05:32:28 UTC
++++ configure.ac
+@@ -16,9 +16,6 @@ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
+ 
+-# Initialize libtool
+-AC_PROG_LIBTOOL
+-
+ PROXY_VERSION=nxproxy_version
+ AC_SUBST([PROXY_VERSION])
+