diff --git a/Mesa.changes b/Mesa.changes
index 00ddadc..1c2630e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 17 14:12:52 UTC 2016 - sndirsch@suse.com
+
+- let Mesa-libVulkan-devel conflict with vulkan-devel due to file
+  conflics in both packages
+
 -------------------------------------------------------------------
 Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 74d47d8..e678a57 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -559,6 +559,7 @@ This package contains the Vulkan parts for Mesa.
 Summary:        Mesas Vulkan development files
 Group:          Development/Libraries/C and C++
 Requires:       libvulkan_intel = %{version}
+Conflicts:      vulkan-devel
 
 %description libVulkan-devel
 This package contains the development files for Mesas Vulkan implementation.