diff --git a/Mesa.changes b/Mesa.changes
index 5395cb1..7cb3890 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 29 09:23:27 UTC 2017 - sndirsch@suse.com
+
+- specfile: only require libglvnd0/libglvnd-devel, if libglvnd build
+  is enabled
+- baselibs.conf: added requires to libglvnd0/libglvnd-devel where
+  needed
+
 -------------------------------------------------------------------
 Mon Mar 27 13:56:35 UTC 2017 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 778c791..35a4020 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -20,6 +20,8 @@
 # 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
@@ -229,7 +231,9 @@ just Mesa or The Mesa 3-D graphics library.
 # Kudos to Debian for the descriptions
 Summary:        Free implementation of the EGL API
 Group:          System/Libraries
+%if 0%{?libglvnd}
 Requires:       libglvnd0 >= 0.1.0
+%endif
 
 %description -n Mesa-libEGL1
 This package contains the EGL native platform graphics interface
@@ -246,7 +250,9 @@ support.
 Summary:        Development files for the EGL API
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-libEGL1 = %{version}
+%if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
+%endif
 # Other requires taken care of by pkgconfig already
 
 %description -n Mesa-libEGL-devel
@@ -263,7 +269,9 @@ programs against the EGL library.
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
 Requires:       Mesa = %{version}
+%if 0%{?libglvnd}
 Requires:       libglvnd0 >= 0.1.0
+%endif
 
 %description -n Mesa-libGL1
 Mesa is a software library for 3D computer graphics that provides a
@@ -279,7 +287,9 @@ the X Window System.
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-libGL1 = %{version}
+%if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
+%endif
 
 %description -n Mesa-libGL-devel
 Mesa is a software library for 3D computer graphics that provides a
@@ -292,7 +302,9 @@ programs with Mesa.
 %package -n Mesa-libGLESv1_CM1
 Summary:        Free implementation of the OpenGL|ES 1.x Common Profile API
 Group:          System/Libraries
+%if 0%{?libglvnd}
 Requires:       libglvnd0 >= 0.1.0
+%endif
 
 %description -n Mesa-libGLESv1_CM1
 OpenGL|ES is a cross-platform API for full-function 2D and 3D
@@ -306,7 +318,9 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-libGLESv1_CM1 = %{version}
+%if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
+%endif
 Requires:       pkgconfig(egl)
 
 %description -n Mesa-libGLESv1_CM-devel
@@ -323,7 +337,9 @@ using the OpenGL|ES 1.x APIs.
 %package -n Mesa-libGLESv2-2
 Summary:        Free implementation of the OpenGL|ES 2.x API
 Group:          System/Libraries
+%if 0%{?libglvnd}
 Requires:       libglvnd0 >= 0.1.0
+%endif
 
 %description -n Mesa-libGLESv2-2
 OpenGL|ES is a cross-platform API for full-function 2D and 3D
@@ -341,7 +357,9 @@ ES 3 entry points.
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-libGLESv2-2 = %{version}
+%if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
+%endif
 Requires:       pkgconfig(egl)
 
 %description -n Mesa-libGLESv2-devel
diff --git a/baselibs.conf b/baselibs.conf
index ebe1ac0..6e4042a 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -3,6 +3,7 @@ Mesa
 	provides  "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 	provides "Mesa-libIndirectGL1-<targettype> = <version>"
 	obsoletes "Mesa-libIndirectGL1-<targettype> < <version>"
+	requires "libglvnd0-<targettype> >= 0.1.0"
 Mesa-devel
 	#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
 	requires "Mesa-<targettype> = <version>"
@@ -14,28 +15,36 @@ Mesa-devel
 	requires "Mesa-libglapi-devel-<targettype> = <version>"
 	requires "libOSMesa-devel-<targettype> = <version>"
 	requires "libgbm-devel-<targettype> = <version>"
-    #Activate libwayland-egl-devel once 12.2 is gone
-	#requires "libwayland-egl-devel-<targettype> = <version>"
+	requires "libwayland-egl-devel-<targettype> = <version>"
+	requires "libglvnd-devel-<targettype> >= 0.1.0"
 	obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 	provides  "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 	obsoletes "Mesa-libIndirectGL-devel-<targettype> < <version>"
 	provides "Mesa-libIndirectGL-devel-<targettype> = <version>"
 
 Mesa-libEGL1
+	requires "libglvnd0-<targettype> >= 0.1.0"
 Mesa-libEGL-devel
 	requires "Mesa-libEGL1-<targettype> = <version>"
+	requires "libglvnd-devel-<targettype> >= 0.1.0"
 Mesa-libGL1
 	requires "Mesa-<targettype>"
+	requires "libglvnd0-<targettype> >= 0.1.0"
 Mesa-libGL-devel
 	requires "Mesa-libGL1-<targettype> = <version>"
+	requires "libglvnd-devel-<targettype> >= 0.1.0"
 Mesa-libGLESv1_CM1
+	requires "libglvnd0-<targettype> >= 0.1.0"
 Mesa-libGLESv1_CM-devel
 	requires "Mesa-libEGL-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv1_CM1-<targettype> = <version>"
+	requires "libglvnd-devel-<targettype> >= 0.1.0"
 Mesa-libGLESv2-2
+	requires "libglvnd0-<targettype> >= 0.1.0"
 Mesa-libGLESv2-devel
 	requires "Mesa-libEGL-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv2-2-<targettype> = <version>"
+	requires "libglvnd-devel-<targettype> >= 0.1.0"
 Mesa-libGLESv3-devel
 	requires "Mesa-libEGL-devel-<targettype> = <version>"
 libOSMesa8