diff --git a/security/openconnect-gui/Makefile b/security/openconnect-gui/Makefile
index ff6694804f92..c10e07402774 100644
--- a/security/openconnect-gui/Makefile
+++ b/security/openconnect-gui/Makefile
@@ -1,36 +1,37 @@
 # Created by: Piotr Kubaj <pkubaj@FreeBSD.org>
 
 PORTNAME=	openconnect-gui
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 MASTER_SITES=	https://gitlab.com/openconnect/openconnect-gui/-/archive/v${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Graphical OpenConnect client
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	openconnect:security/openconnect
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libspdlog.so:devel/spdlog \
 		libfmt.so:devel/libfmt
 RUN_DEPENDS=	openconnect:security/openconnect \
 		vpnc-scripts>=0:sysutils/vpnc-scripts
 
 USES=		cmake:insource compiler:c++11-lang pkgconfig qt:5
 USE_GITHUB=	nodefault
 GH_TUPLE=	qtproject:qt-solutions:a8dda66d:qtsolutions/external/src/qt-solutions-master
 USE_QT=		buildtools_build concurrent core gui network qmake_build widgets
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 PLIST_FILES=	bin/openconnect-gui
 
 do-install:
 	${MV} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake b/security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake
index 3604ecf590cc..78ae0a73d2dc 100644
--- a/security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake
+++ b/security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake
@@ -1,33 +1,35 @@
 --- CMake/Includes/ProjectExternals_qt-solutions.cmake.orig	2018-03-25 21:49:15 UTC
 +++ CMake/Includes/ProjectExternals_qt-solutions.cmake
-@@ -9,10 +9,7 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
+@@ -9,11 +9,9 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
      UPDATE_DISCONNECTED 0
      UPDATE_COMMAND ""
      
 -    GIT_REPOSITORY https://code.qt.io/qt-solutions/qt-solutions.git
 -    GIT_TAG ${qt-solutions-TAG}
 -    GIT_SHALLOW 1
 -    
 +    SOURCE_DIR ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master
      BUILD_IN_SOURCE 1
++    BUILD_COMMAND ${CMAKE_COMMAND} --build .
          
      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
-@@ -21,14 +18,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
+         ${CMAKE_SOURCE_DIR}/CMake/Includes/CMakeLists_qt-solutions.cmake.in
+@@ -21,14 +19,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
          CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
  
      # Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :(
 -    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
 -    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
 +    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
 +    INSTALL_COMMAND ${CMAKE_COMMAND} --build .
  )
  
  add_library(qt-solutions::qtsingleapplication STATIC IMPORTED)
  set_target_properties(qt-solutions::qtsingleapplication PROPERTIES
 -    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include"
 -    IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
 +    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/qtsingleapplication/src"
 +    IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
  )
  set_property(TARGET qt-solutions::qtsingleapplication PROPERTY
      DEPENDS qt-solutions-${qt-solutions-TAG}