diff --git a/Mesa.changes b/Mesa.changes
index 7cb3890..3354970 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 29 15:18:19 UTC 2017 - sndirsch@suse.com
+
+- specfile: Remove requires to libglvnd0/libglvnd-devel from 
+  baselibs.conf when libglvnd build has been disabled; ugly ...
+
 -------------------------------------------------------------------
 Wed Mar 29 09:23:27 UTC 2017 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 35a4020..17f0267 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -20,8 +20,6 @@
 # They may fix KDE on Nouveau. They may also deadlock your userland.
 %define use_broken_nouveau_locking_patches 0
 
-# Remove requires to libglvnd0/libglvnd-devel from baselibs.conf when
-# disabling libglvnd build
 %define libglvnd 0
 %if 0%{?suse_version} >= 1330
 %define libglvnd 1
@@ -669,6 +667,13 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch65 -p1
 %endif
 
+# Remove requires to libglvnd0/libglvnd-devel from baselibs.conf when
+# disabling libglvnd build; ugly ...
+%if 0%{?libglvnd} == 0
+grep -v libglvnd $RPM_SOURCE_DIR/baselibs.conf > $RPM_SOURCE_DIR/temp && \
+  mv $RPM_SOURCE_DIR/temp $RPM_SOURCE_DIR/baselibs.conf
+%endif
+
 %build
 %if 0%{?suse_version} > 1320
 egl_platforms=x11,drm,wayland