diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index b998e5e508db..d47ffcace3e2 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -1,71 +1,71 @@
 # Created by: arved
 
 PORTNAME=	x2goclient
 PORTVERSION=	4.1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Qt client for the X2Go system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Avoid clash with libssh from base
 BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
 LIB_DEPENDS=	libcups.so:print/cups \
 		libssh.so:security/libssh
 RUN_DEPENDS=	nxproxy:net/nxproxy \
 		x2goclient-cli:net/x2goclient-cli
 
 USES=		compiler:c++11-lang gl pkgconfig qmake qt:5 xorg
 USE_GL=		gl
 USE_XORG=	x11 xpm
 USE_QT=		core gui network svg widgets x11extras  \
 		buildtools_build linguisttools_build qmake_build
 QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"
 
 OPTIONS_DEFINE=		DOCS LDAP
 OPTIONS_DEFAULT=	LDAP
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CFLAGS=		-DUSELDAP
 LDAP_QMAKE_ON=		LIBS+="-lX11 -lXpm -lcups -lldap"
 LDAP_QMAKE_OFF=		LIBS+="-lX11 -lXpm -lcups"
 
 post-patch:
 	@${FIND} ${WRKSRC}/src -name "*.cpp" -or -name "*.h" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|Q_OS_LINUX|Q_OS_UNIX| ; \
 		 /<linux\/fs.h>/s|^|//| ; \
 		 /#define USELDAP/s|^|//| ; \
 		 s|/usr/local/bin|${LOCALBASE}/bin|'
 
 pre-build:
 	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/x2goclient.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/desktop/x2goclient.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 .for i in 16x16 32x32 48x48 64x64 128x128
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/${i}/x2goclient.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/x2goclient.xpm \
 		${STAGEDIR}${DATADIR}/icons
 .for i in x2goclient.png x2gosession.png
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/128x128/${i} \
 		${STAGEDIR}${DATADIR}/icons
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/x2goclient/files/patch-src_onmainwindow.cpp b/net/x2goclient/files/patch-src_onmainwindow.cpp
new file mode 100644
index 000000000000..7b6cd3b95de0
--- /dev/null
+++ b/net/x2goclient/files/patch-src_onmainwindow.cpp
@@ -0,0 +1,11 @@
+--- src/onmainwindow.cpp.orig	2021-08-11 18:57:54 UTC
++++ src/onmainwindow.cpp
+@@ -1372,7 +1372,7 @@ void ONMainWindow::closeClient()
+ 
+         st.setting()->setValue ( "mainwindow/size",
+                                  QVariant ( size() ) );
+-        st.setting()->setValue ( "mainwindow/pos",QVariant ( pos() ) );
++        st.setting()->setValue ( "mainwindow/pos",QVariant ( mapToGlobal(QPoint(0,0) ) ));
+         st.setting()->setValue ( "mainwindow/maximized",
+                                  QVariant ( isMaximized() ) );
+         st.setting()->sync();