diff --git a/mesa.spec b/mesa.spec
index e2751ef..21de89a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -18,7 +18,9 @@
 %define platform_drivers ,i915,i965
 %define with_vmware 1
 %define with_xa     1
-%define with_vulkan 1
+%define vulkan_drivers --with-vulkan-drivers=intel,radeon
+%else
+%define vulkan_drivers --with-vulkan-drivers=radeon
 %endif
 
 %ifarch %{arm} aarch64
@@ -41,10 +43,6 @@
 
 %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
 
-%if 0%{?with_vulkan}
-%define vulkan_drivers --with-vulkan-drivers=intel,radeon
-%endif
-
 %global sanitize 1
 
 #global rctag rc4
@@ -52,7 +50,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        18.1.2
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -129,7 +127,7 @@ BuildRequires: libomxil-bellagio-devel
 %if 0%{?with_opencl}
 BuildRequires: libclc-devel opencl-filesystem
 %endif
-%if 0%{?with_vulkan}
+%if 0%{?with_hardware}
 BuildRequires: vulkan-devel
 %endif
 BuildRequires: python3-mako
@@ -341,7 +339,6 @@ Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
 %{summary}.
 %endif
 
-%if 0%{?with_vulkan}
 %package vulkan-drivers
 Summary:        Mesa Vulkan drivers
 Requires:       vulkan%{_isa}
@@ -356,7 +353,6 @@ Requires:       vulkan-devel
 
 %description vulkan-devel
 Headers for development with the Vulkan API.
-%endif
 
 %prep
 %autosetup -n %{name}-%{version}%{?rctag:-%{rctag}} -p1
@@ -397,9 +393,7 @@ autoreconf -vfi
     %{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \
     --enable-glx-tls \
     --enable-texture-float=yes \
-%if 0%{?with_vulkan}
     %{?vulkan_drivers} \
-%endif
     --enable-llvm \
     --enable-llvm-shared-libs \
     --enable-dri \
@@ -654,23 +648,24 @@ popd
 %endif
 %endif
 
-%if 0%{?with_vulkan}
 %files vulkan-drivers
+%if 0%{?with_hardware}
+%ifarch %{ix86} x86_64
 %{_libdir}/libvulkan_intel.so
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
+%endif
 %{_libdir}/libvulkan_radeon.so
-%ifarch x86_64
-%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
-%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
-%else
-%{_datadir}/vulkan/icd.d/intel_icd.i686.json
-%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
 %endif
 
 %files vulkan-devel
 %{_includedir}/vulkan/
-%endif
 
 %changelog
+* Mon Jun 18 2018 Adam Jackson <ajax@redhat.com> - 18.1.2-2
+- Build mesa-vulkan-drivers everywhere
+- Build actual vulkan drivers on all but s390x
+
 * Sat Jun 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.2-1
 - Mesa 18.1.2