diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 9e29839..98b10a3 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -1,26 +1,11 @@
-%if 0%{?rhel}
-%define with_private_llvm 1
-%else
 %define with_private_llvm 0
-%endif
-
 %define with_vdpau 1
 %define with_wayland 1
-
-%ifnarch ppc
 %define with_radeonsi 1
-%endif
-
 %ifarch %{arm} aarch64
 %define with_freedreno 1
 %endif
-
-# S390 doesn't have video cards, but we need swrast for xserver's GLX
-# llvm (and thus llvmpipe) doesn't actually work on ppc32 or s390
-
-%ifnarch s390 ppc
 %define with_llvm 1
-%endif
 
 %ifarch s390 s390x
 %define with_hardware 0
@@ -353,17 +338,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 #%patch21 -p1 -b .glpc
 %patch31 -p1 -b .codemodel
 
-%if 0%{with_private_llvm}
-sed -i 's/\[llvm-config\]/\[llvm-private-config-%{__isa_bits}\]/g' configure.ac
-sed -i 's/`$LLVM_CONFIG --version`/$LLVM_VERSION_MAJOR.$LLVM_VERSION_MINOR-rhel/' configure.ac
-%endif
-
-# need to use libdrm_nouveau2 on F17
-%if !0%{?rhel}
-%if 0%{?fedora} < 18
-sed -i 's/\<libdrm_nouveau\>/&2/' configure.ac
-%endif
-%endif
+#sed -i 's|${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h|${LLVM_INCLUDEDIR}/llvm/llvm/Config/llvm-config.h|' configure.ac
+sed -i 's/LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`/LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`\/llvm/' configure.ac
 
 cp %{SOURCE4} docs/
 
@@ -383,6 +359,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
 %define asm_flags --disable-asm
 %endif
 
+find src -name '*Makefile.in' -type f -print -exec sed -i 's/@LLVM_INCLUDEDIR@/@LLVM_INCLUDEDIR@\/llvm/' {} \;
+
 %configure \
     %{?asm_flags} \
     --enable-libglvnd \
@@ -394,7 +372,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
     --enable-gles2 \
     --disable-xvmc \
     %{?with_vdpau:--enable-vdpau} \
-    --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \
+    --with-platforms=x11,drm%{?with_wayland:,wayland} \
     --enable-shared-glapi \
     --enable-gbm \
     --disable-opencl \
@@ -403,7 +381,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
 %if %{with_vulkan}
     %{?vulkan_drivers} \
 %endif
-    %{?with_llvm:--enable-gallium-llvm} \
+    %{?with_llvm:--enable-llvm} \
     --enable-dri \
 %if %{with_hardware}
     %{?with_vmware:--enable-xa} \
@@ -529,9 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?with_llvm}
 %{_libdir}/dri/r300_dri.so
 %{_libdir}/dri/r600_dri.so
-%if 0%{?with_radeonsi}
+%{_libdir}/dri/r600_drv_video.so
 %{_libdir}/dri/radeonsi_dri.so
-%endif
+%{_libdir}/dri/radeonsi_drv_videa.so
 %endif
 %ifarch %{ix86} x86_64
 %{_libdir}/dri/i915_dri.so
@@ -542,6 +520,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/dri/msm_dri.so
 %endif
 %{_libdir}/dri/nouveau_dri.so
+%{_libdir}/dri/nouveau_drv_video.so
 %{_libdir}/dri/virtio_gpu_dri.so
 %if 0%{?with_vmware}
 %{_libdir}/dri/vmwgfx_dri.so