diff --git a/.gitignore b/.gitignore
index 29c49b9..57c3d19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xorgxrdp-0.9.19.tar.gz
+SOURCES/xorgxrdp-3d30c7a6ad4f4a582efcb919966d8f1508aa2d31.tar.gz
diff --git a/.xorgxrdp-egfx.metadata b/.xorgxrdp-egfx.metadata
new file mode 100644
index 0000000..5473541
--- /dev/null
+++ b/.xorgxrdp-egfx.metadata
@@ -0,0 +1 @@
+0d408140fe218d1c70d4dca06001d99d4ca76500  SOURCES/xorgxrdp-3d30c7a6ad4f4a582efcb919966d8f1508aa2d31.tar.gz
diff --git a/.xorgxrdp.metadata b/.xorgxrdp.metadata
deleted file mode 100644
index da1197b..0000000
--- a/.xorgxrdp.metadata
+++ /dev/null
@@ -1 +0,0 @@
-fd66e76b044f4a7862011dba47bfc4d5859de087  SOURCES/xorgxrdp-0.9.19.tar.gz
diff --git a/SPECS/xorgxrdp.spec b/SPECS/xorgxrdp.spec
index 23055c7..193f1e1 100644
--- a/SPECS/xorgxrdp.spec
+++ b/SPECS/xorgxrdp.spec
@@ -1,16 +1,21 @@
-Name:           xorgxrdp
-Version:        0.9.19
-Release:        5%{?dist}
+%global real_name xorgxrdp
+
+%global commit 3d30c7a6ad4f4a582efcb919966d8f1508aa2d31
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name:           xorgxrdp-egfx
+Version:        0.9.80
+Release:        0.20230830git%{shortcommit}%{?dist}
 Summary:        Implementation of xrdp backend as Xorg modules
 
 License:        MIT
 URL:            https://github.com/neutrinolabs/xorgxrdp
-Source0:        https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/neutrinolabs/xorgxrdp/archive/%{commit}/%{real_name}-%{commit}.tar.gz
 
 BuildRequires: make
 BuildRequires:  nasm
 BuildRequires:  xorg-x11-server-devel
-BuildRequires:  xrdp-devel >= 1:0.9.17
+BuildRequires:  xrdp-egfx-devel >= 1:0.9.80
 %if 0%{?fedora} > 0 && 0%{?fedora} <= 24
 BuildRequires:  libXfont-devel
 %else
@@ -22,9 +27,12 @@ BuildRequires:  mesa-libgbm-devel
 BuildRequires:  libepoxy-devel
 BuildRequires:  libdrm-devel
 
+Conflicts: %{real_name}-glamor
 Conflicts: %{name}-glamor
 %endif
 
+Conflicts: %{real_name} < 0.9.80
+
 Requires:       Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null)
 Requires:       Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null)
 
@@ -33,6 +41,7 @@ Requires:       Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null)
 Summary:        Implementation of xrdp backend as Xorg modules with glamor
 RemovePathPostfixes: .glamor
 Conflicts: %{name}
+Conflicts: %{real_name}
 
 Requires:       Xorg %(xserver-sdk-abi-requires videodrv 2>/dev/null)
 Requires:       Xorg %(xserver-sdk-abi-requires xinput 2>/dev/null)
@@ -51,9 +60,10 @@ for screen resizing and multiple monitors. Built with glamor support.
 %endif
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{real_name}-%{commit}
 
 %build
+./bootstrap
 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 8
 # Build/install with glamor support first
 CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
@@ -85,6 +95,9 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
 %{__sed} '/^[[:blank:]]*Load "xorgxrdp"/i\    Load "glamoregl"' \
          %{buildroot}%{_sysconfdir}/X11/xrdp/xorg.conf > \
          %{buildroot}%{_sysconfdir}/X11/xrdp/xorg.conf.glamor
+%{__sed} '/^[[:blank:]]*Load "xorgxrdp"/i\    Load "glamoregl"' \
+         %{buildroot}%{_sysconfdir}/X11/xrdp/xorg_nvidia.conf > \
+         %{buildroot}%{_sysconfdir}/X11/xrdp/xorg_nvidia.conf.glamor
 %endif
 
 %files
@@ -92,6 +105,7 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
 %doc README.md
 %dir %{_sysconfdir}/X11/xrdp
 %{_sysconfdir}/X11/xrdp/xorg.conf
+%{_sysconfdir}/X11/xrdp/xorg_nvidia.conf
 %{_libdir}/xorg/modules/drivers/xrdpdev_drv.so
 %{_libdir}/xorg/modules/input/xrdpkeyb_drv.so
 %{_libdir}/xorg/modules/input/xrdpmouse_drv.so
@@ -109,6 +123,7 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
 %doc README.md
 %dir %{_sysconfdir}/X11/xrdp
 %{_sysconfdir}/X11/xrdp/xorg.conf.glamor
+%{_sysconfdir}/X11/xrdp/xorg_nvidia.conf.glamor
 %{_libdir}/xorg/modules/drivers/xrdpdev_drv.so.glamor
 %{_libdir}/xorg/modules/input/xrdpkeyb_drv.so.glamor
 %{_libdir}/xorg/modules/input/xrdpmouse_drv.so.glamor
@@ -122,6 +137,9 @@ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libdrm" \
 %endif
 
 %changelog
+* Mon Dec 18 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.80-0.20230830gitf5103aa4
+- Build Development version with EGFX support from gfx_mainline_merge
+
 * Fri Oct 06 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 0.9.19-5
 - Rebuilt for MSVSphere 9.2