diff --git a/mesa.spec b/mesa.spec
index 4ad2dce..ccd80be 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -446,9 +446,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc docs/COPYING docs/Mesa-MLAA-License-Clarification-Email.txt
 %dir %{_libdir}/dri
-%if %{with_hardware}%{?with_vdpau}
+%if %{with_hardware}
+%if 0%{?with_vdpau}
 %dir %{_libdir}/vdpau
 %endif
+%endif
 
 %files libglapi
 %{_libdir}/libglapi.so.0
@@ -485,13 +487,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdricore*.so*
 %{_libdir}/dri/swrast_dri.so
 
-%if %{with_hardware}%{?with_vdpau}
+%if %{with_hardware}
+%if 0%{?with_vdpau}
 %files vdpau-drivers
 %defattr(-,root,root,-)
 %{_libdir}/vdpau/libvdpau_nouveau.so.1*
 %{_libdir}/vdpau/libvdpau_r600.so.1*
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 %endif
+%endif
 
 %files -n khrplatform-devel
 %defattr(-,root,root,-)