diff --git a/Mesa.changes b/Mesa.changes
index 720c02b..8e32596 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 22 13:46:54 UTC 2014 - sndirsch@suse.com
+
+- u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
+  Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
+  (bnc#892896)
+
 -------------------------------------------------------------------
 Fri Aug 15 12:31:54 UTC 2014 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 446d4fb..d4d5128 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -150,6 +150,7 @@ Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 Patch16:        U_mesa-glx-Reduce-error-log-level.patch
+Patch17:        u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -516,6 +517,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch13 -p1
 ###
 %patch16 -p1
+%patch17 -p1
 
 %build
 rm -f src/mesa/depend
diff --git a/u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch b/u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
new file mode 100644
index 0000000..1bce1b0
--- /dev/null
+++ b/u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
@@ -0,0 +1,30 @@
+From f69eca0843142d16c81cc3efd02fc50cf219cafd Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Fri, 22 Aug 2014 14:35:06 +0200
+Subject: [PATCH] Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
+ (bnc#892896)
+
+Let's handle LIBGL_DEBUG env. variable in Mesa in a consistent way.
+---
+ src/mesa/drivers/dri/common/xmlconfig.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
+index ce37647..8e48522 100644
+--- a/src/mesa/drivers/dri/common/xmlconfig.c
++++ b/src/mesa/drivers/dri/common/xmlconfig.c
+@@ -429,8 +429,10 @@ static void
+ __driUtilMessage(const char *f, ...)
+ {
+     va_list args;
++    const char *libgl_debug;
+ 
+-    if (getenv("LIBGL_DEBUG")) {
++    libgl_debug=getenv("LIBGL_DEBUG");
++    if (libgl_debug && !strstr(libgl_debug, "quiet")) {
+         fprintf(stderr, "libGL: ");
+         va_start(args, f);
+         vfprintf(stderr, f, args);
+-- 
+1.8.4.5
+