diff --git a/x11-wm/kwinft/files/patch-CMakeLists.txt b/x11-wm/kwinft/files/patch-CMakeLists.txt
index af5a512ecf8c..81c7ee253a85 100644
--- a/x11-wm/kwinft/files/patch-CMakeLists.txt
+++ b/x11-wm/kwinft/files/patch-CMakeLists.txt
@@ -1,20 +1,22 @@
+https://gitlab.com/kwinft/kwinft/-/issues/209
+
 CMake Error at CMakeLists.txt:816 (add_executable):
   Target "kwin_wayland" links to target "Threads::Threads" but the target was
   not found.  Perhaps a find_package() call is missing for an IMPORTED
   target, or an ALIAS target is missing?
 
 --- CMakeLists.txt.orig	2021-10-14 15:22:02 UTC
 +++ CMakeLists.txt
 @@ -168,6 +168,12 @@ set_package_properties(XKB PROPERTIES
  
  find_package(Qt5XkbCommonSupport REQUIRED)
  
 +find_package(Threads)
 +set_package_properties(Threads PROPERTIES
 +    TYPE REQUIRED
 +    PURPOSE "Required for building KWin with Wayland support"
 +)
 +
  find_package(Libinput 1.9)
  set_package_properties(Libinput PROPERTIES TYPE REQUIRED PURPOSE "Required for input handling on Wayland.")
  
diff --git a/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h b/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h
index e003f18e6925..3e1ae351c4d3 100644
--- a/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h
+++ b/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h
@@ -1,16 +1,18 @@
+https://gitlab.com/kwinft/kwinft/-/issues/210
+
 In file included from plugins/scenes/opengl/scene_opengl.cpp:30:
 plugins/scenes/opengl/scene_opengl.h:93:10: error: no template named 'unordered_map' in namespace 'std'
     std::unordered_map<uint32_t, OpenGLWindow*> windows;
     ~~~~~^
 
 --- plugins/scenes/opengl/scene_opengl.h.orig	2021-06-08 12:27:49 UTC
 +++ plugins/scenes/opengl/scene_opengl.h
 @@ -30,6 +30,8 @@ along with this program.  If not, see <http://www.gnu.
  #include "decorations/decorationrenderer.h"
  #include "platformsupport/scenes/opengl/backend.h"
  
 +#include <unordered_map>
 +
  namespace KWin
  {
  class LanczosFilter;
diff --git a/x11-wm/kwinft/pkg-message b/x11-wm/kwinft/pkg-message
index 302348a5e62a..392fed0f34f3 100644
--- a/x11-wm/kwinft/pkg-message
+++ b/x11-wm/kwinft/pkg-message
@@ -1,44 +1,45 @@
 [
 { type: install
   message: <<EOM
 WARNING: X11 support is currently unstable on FreeBSD. Replacing KWin
          in Plasma Desktop may not work. Test standalone first.
+         See also https://gitlab.com/kwinft/kwinft/-/issues/208
 
 Native Wayland on top of KMS console:
 
   $ export XDG_RUNTIME_DIR=$(mktemp -dt run)
   $ dbus-daemon --session --fork --address=unix:runtime=yes
   $ seatd-launch kwin_wayland
 
 Native X11 on top of Xorg:
 
   $ echo "exec dbus-run-session kwin_x11" >~/.xinitrc
   $ startx
 
 Nested under Wayland as Wayland window manager:
 
   $ kwin_wayland
 
 Nested under Wayland as X11 window manager:
 
   $ Xwayland :8 &
   $ DISPLAY=:8 kwin_x11
 
 Nested under X11 as Wayland window manager:
 
   $ cage kwin_wayland
 
 Nested under X11 as X11 window manager:
 
   $ Xephyr :8 &
   $ DISPLAY=:8 kwin_x11
 
 Replace KWin in Plasma Desktop:
 
   $ pkg set -n plasma5-kwin:kwinft
   $ pkg set -o x11-wm/plasma5-kwin:x11-wm/kwinft
   $ pkg upgrade -f kwinft
   $ pkg lock kwinft
 EOM
 }
 ]