diff --git a/0001-Revert-mesa-unreference-current-winsys-buffers-when-.patch b/0001-Revert-mesa-unreference-current-winsys-buffers-when-.patch
new file mode 100644
index 0000000..9822e2c
--- /dev/null
+++ b/0001-Revert-mesa-unreference-current-winsys-buffers-when-.patch
@@ -0,0 +1,36 @@
+From 7fe5a8e874b2cae2b1ada3f6aab8ca6766753b1e Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 27 May 2019 09:36:28 +1000
+Subject: [PATCH] Revert "mesa: unreference current winsys buffers when
+ unbinding winsys buffers"
+
+This reverts commit 12bf7cfecf52083c484602f971738475edfe497e.
+
+This commits caused lots of problems:
+https://bugs.freedesktop.org/show_bug.cgi?id=110721
+https://bugs.freedesktop.org/show_bug.cgi?id=110761
+
+Fixes: 12bf7cfecf52 ("mesa: unreference current winsys buffers when unbinding winsys buffers")
+Pushing without review as we need to get it into next stable.
+---
+ src/mesa/main/context.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
+index 04ef4d500d8..34da16b88f4 100644
+--- a/src/mesa/main/context.c
++++ b/src/mesa/main/context.c
+@@ -1765,10 +1765,6 @@ _mesa_make_current( struct gl_context *newCtx,
+ 
+          check_init_viewport(newCtx, drawBuffer->Width, drawBuffer->Height);
+       }
+-      else {
+-         _mesa_reference_framebuffer(&newCtx->WinSysDrawBuffer, NULL);
+-         _mesa_reference_framebuffer(&newCtx->WinSysReadBuffer, NULL);
+-      }
+ 
+       if (newCtx->FirstTimeCurrent) {
+          handle_first_current(newCtx);
+-- 
+2.20.1
+
diff --git a/mesa.spec b/mesa.spec
index e89ebcf..103e9a9 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -48,7 +48,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 19.0.5
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -58,6 +58,9 @@ Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
+# Local revert for 19.0.5 issue
+Patch0:		0001-Revert-mesa-unreference-current-winsys-buffers-when-.patch
+
 Patch3:         0003-evergreen-big-endian.patch
 
 # Disable rgb10 configs by default:
@@ -613,6 +616,9 @@ popd
 %endif
 
 %changelog
+* Mon May 27 2019 Dave Airlie <airlied@redhat.com> - 19.0.5-2
+- Revert broken patch in 19.0.5
+
 * Wed May 22 2019 Pete Walter <pwalter@fedoraproject.org> - 19.0.5-1
 - Update to 19.0.5