diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 4624d957..a5a906cd 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -107,6 +107,9 @@ PACKAGECONFIG:append:pn-libcamera = " gst"
 # Enable gstreamer based video for kmscube
 PACKAGECONFIG:append:pn-kmscube = " gstreamer"
 
+# Enable wayland backend for glfw
+PACKAGECONFIG:append:pn-glfw = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
+
 # Disable opengl for opencl-cts by default
 PACKAGECONFIG:remove:pn-opencl-cts = "opengl gles vulkan"
 
diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw-arago.inc b/meta-arago-extras/recipes-graphics/glfw/glfw-arago.inc
deleted file mode 100644
index 8352a866..00000000
--- a/meta-arago-extras/recipes-graphics/glfw/glfw-arago.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Add some wayland configuration options until meta-oe adds some good
-# PACKAGECONFIGS
-
-PR:append = ".arago1"
-
-PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon"
-
-PACKAGECONFIG += " wayland"
diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend b/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend
deleted file mode 100644
index 8aa73700..00000000
--- a/meta-arago-extras/recipes-graphics/glfw/glfw_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-GLFW_ARAGO = ""
-GLFW_ARAGO:arago = "glfw-arago.inc"
-
-require ${GLFW_ARAGO}