diff --git a/xf86-video-fbturbo-0.4.0-xorg-server-21.1.3.patch b/xf86-video-fbturbo-0.4.0-xorg-server-21.1.3.patch
new file mode 100644
index 0000000..df174c5
--- /dev/null
+++ b/xf86-video-fbturbo-0.4.0-xorg-server-21.1.3.patch
@@ -0,0 +1,33 @@
+diff --git a/src/backing_store_tuner.c b/src/backing_store_tuner.c
+index 067c05f..13f7ec3 100644
+--- a/src/backing_store_tuner.c
++++ b/src/backing_store_tuner.c
+@@ -109,7 +109,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
+     private->PostValidateTreeNestingLevel++;
+ 
+     /* Disable backing store for the focus window */
+-    if (!private->ForceBackingStore && focusWin->backStorage) {
++    if (!private->ForceBackingStore && (focusWin->backingStore != NotUseful)) {
+         DebugMsg("Disable backing store for the focus window 0x%x\n",
+                  (unsigned int)focusWin->drawable.id);
+         pScreen->backingStoreSupport = Always;
+@@ -125,7 +125,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
+     /* And enable backing store for all the other children of root */
+     curWin = pScreen->root->firstChild;
+     while (curWin) {
+-        if (!curWin->backStorage && (private->ForceBackingStore ||
++        if ((curWin->backingStore == NotUseful) && (private->ForceBackingStore ||
+                                      curWin != focusWin)) {
+             DebugMsg("Enable backing store for window 0x%x\n",
+                      (unsigned int)curWin->drawable.id);
+@@ -158,7 +158,7 @@ xReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
+     }
+ 
+     /* We only want backing store set for direct children of root */
+-    if (pPriorParent == pScreen->root && pWin->backStorage) {
++    if (pPriorParent == pScreen->root && (pWin->backingStore != NotUseful)) {
+         DebugMsg("Reparent window 0x%x from root, disabling backing store\n",
+                  (unsigned int)pWin->drawable.id);
+         pScreen->backingStoreSupport = Always;
+--
+2.16.2
diff --git a/xf86-video-fbturbo.spec b/xf86-video-fbturbo.spec
index b3ed9c4..113efc3 100644
--- a/xf86-video-fbturbo.spec
+++ b/xf86-video-fbturbo.spec
@@ -1,6 +1,7 @@
+%define xorg_ver %(pkg-config xorg-server --modversion|cut -d. -f 1-2)
 Name:          xf86-video-fbturbo
 Version:       0.4.0
-Release:       2mamba
+Release:       3mamba
 Summary:       Video driver, primarily optimized for the devices powered by the Allwinner SoC 
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -8,12 +9,15 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/ssvb/xf86-video-fbturbo
 Source:        https://github.com/ssvb/xf86-video-fbturbo.git/%{version}/xf86-video-fbturbo-%{version}.tar.bz2
+Patch0:        xf86-video-fbturbo-0.4.0-xorg-server-21.1.3.patch
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
+#ld-linux.so.3(GLIBC_2.4): .so link not found
+#ld-linux.so.3: .so link not found
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Requires:      xorg-server >= %{xorg_ver}
+Requires:      xorg-server <= %{xorg_ver}.255
 
 %description
 Video driver, primarily optimized for the devices powered by the Allwinner SoC (A10, A13, A20). It can use some of the 2D/3D hardware acceleration features.
@@ -22,6 +26,7 @@ Video driver, primarily optimized for the devices powered by the Allwinner SoC (
 
 %prep
 %setup -q
+%patch0 -p1 -b .xorg-server-21.1.3
 
 %build
 %configure
@@ -45,6 +50,9 @@ install -D -m0644 xorg.conf %{buildroot}%{_datadir}/X11/xorg.conf.d/99-fbturbo.c
 %doc COPYING
 
 %changelog
+* Wed Jun 22 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.0-3mamba
+- rebuilt with xorg-server 21.1.3
+
 * Sat Oct 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.0-2mamba
 - install xorg configuration snipppet