diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile
index 53230df60d29..64a87653bc99 100644
--- a/x11-wm/plasma5-kwin/Makefile
+++ b/x11-wm/plasma5-kwin/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	kwin
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-wm kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 window manager
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libXcursor.so:x11/libXcursor \
 		libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libinput.so:x11/libinput \
 		libudev.so:devel/libudev-devd \
 		liblcms2.so:graphics/lcms2 \
 		libwayland-cursor.so:graphics/wayland \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxkbcommon.so:x11/libxkbcommon
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		xwayland-devel>0:x11-servers/xwayland-devel
 RUN_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel
 
 USES=		cmake compiler:c++11-lib gettext gl gnome kde:5 pkgconfig \
 		python:3.5+,run qt:5 shebangfix tar:xz xorg
 USE_GL=		egl
 USE_GNOME=	glib20
 USE_KDE=	activities attica auth breeze codecs completion config \
 		configwidgets coreaddons crash decoration globalaccel i18n \
 		iconthemes idletime init jobwidgets kcmutils kdeclarative kio \
 		kscreenlocker kwayland-integration kwayland-server newstuff \
 		notifications package plasma-framework \
 		plasma-wayland-protocols runner service sonnet textwidgets \
 		wayland widgetsaddons windowsystem xmlgui \
 		doctools_build ecm_build
 USE_LDCONFIG=	yes
 USE_QT=		concurrent core dbus declarative gui multimedia network script \
 		sensors uiplugin uitools widgets x11extras xml \
 		buildtools_build qmake_build testlib_build \
 		quickcontrols2_run virtualkeyboard_run
 USE_XORG=	ice sm x11 xcb xext xi
 SHEBANG_FILES=	kconf_update/*.py \
 		kconf_update/*.pl
 
 .include <bsd.port.mk>
diff --git a/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp
new file mode 100644
index 000000000000..ad44c2215dca
--- /dev/null
+++ b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp
@@ -0,0 +1,35 @@
+$ kwin_wayland --xwayland
+[...]
+kwin_xwl: Failed to find free X11 connection socket
+Failed to establish X11 socket
+
+--- src/xwl/xwaylandsocket.cpp.orig	2021-08-31 11:41:03 UTC
++++ src/xwl/xwaylandsocket.cpp
+@@ -179,10 +179,17 @@ XwaylandSocket::XwaylandSocket()
+             continue;
+         }
+ 
++#if defined(Q_OS_LINUX)
+         const int abstractFileDescriptor = listen_helper(socketFilePath, UnixSocketAddress::Type::Abstract);
++#else
++        const int abstractFileDescriptor = listen_helper(socketFilePath + "_", UnixSocketAddress::Type::Unix);
++#endif
+         if (abstractFileDescriptor == -1) {
+             QFile::remove(lockFilePath);
+             QFile::remove(socketFilePath);
++#if !defined(Q_OS_LINUX)
++            QFile::remove(socketFilePath + "_");
++#endif
+             close(unixFileDescriptor);
+             continue;
+         }
+@@ -208,6 +215,9 @@ XwaylandSocket::~XwaylandSocket()
+     }
+     if (!m_socketFilePath.isEmpty()) {
+         QFile::remove(m_socketFilePath);
++#if !defined(Q_OS_LINUX)
++        QFile::remove(m_socketFilePath + "_");
++#endif
+     }
+     if (!m_lockFilePath.isEmpty()) {
+         QFile::remove(m_lockFilePath);