diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
index d0945465a0..360541ef87 100644
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
+++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
@@ -3,6 +3,8 @@ SOURCES = eglfs-egldevice.cpp
 for(p, QMAKE_LIBDIR_EGL) {
     LIBS += -L$$p
 }
+# Avoid X11 header collision
+DEFINES += MESA_EGL_NO_X11_HEADERS
 
 INCLUDEPATH += $$QMAKE_INCDIR_EGL
 LIBS += $$QMAKE_LIBS_EGL
diff --git a/rpm/qtbase.spec b/rpm/qtbase.spec
index 34c99dc574..6feb45f02c 100644
--- a/rpm/qtbase.spec
+++ b/rpm/qtbase.spec
@@ -36,6 +36,8 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(mtdev)
 BuildRequires:  pkgconfig(libsystemd-journal)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -510,6 +512,8 @@ MAKEFLAGS=%{?_smp_mflags} \
 %ifarch aarch64
 	-no-pch \
 %endif
+    -kms \
+    -gbm \
     -qreal float \
     -journald \
     -no-use-gold-linker
@@ -893,6 +897,8 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos
 %if %{with X11}
 %{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
 %endif
+%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
+%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
 %{_datadir}/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri
 
 %files plugin-platform-minimalegl