diff --git a/Mesa.spec b/Mesa.spec
index 36e1a3e..e5523a0 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -10,7 +10,7 @@
 
 Name:          Mesa
 Epoch:         1
-Version:       18.1.7
+Version:       18.1.8
 Release:       2mamba
 Summary:       A 3-D graphics library with an API which is very similar to that of OpenGL
 Group:         System/Libraries
@@ -334,8 +334,6 @@ Mesa vulkan drivers.
 
 %prep
 %setup -q -n mesa-%{version}
-#-D -T
-#:<< _EOF
 %ifarch arm
 # Force libglx dri backend using swrast on non-DRI accelerated platforms
 sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
@@ -375,7 +373,7 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
    --enable-texture-float \
    --enable-llvm \
    --enable-llvm-shared-libs \
-   --with-gallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl,swr \
+   --with-gallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl \
    --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
    --with-dri-driverdir=%{_libdir}/dri \
    --with-vulkan-drivers=intel,radeon \
@@ -387,6 +385,8 @@ sed -i 's|default_driver="xlib"|default_driver="dri"|' configure
    CXX=clang++ CC=clang
 %endif
 
+# 18.1.8: --with-gallium-driver=swr disabled due to crashes on swrast
+
 #   --with-clang-libdir=%{_libdir}/llvm
 #   --enable-r600-llvm-compiler \
 
@@ -567,10 +567,10 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %{_libdir}/mesa/libGL.so.*
 %{_libdir}/bellagio/libomx_mesa.la
 %{_libdir}/bellagio/libomx_mesa.so
-%ifnarch arm
-%{_libdir}/libswrAVX.so.*
-%{_libdir}/libswrAVX2.so.*
-%endif
+#%ifnarch arm
+#%{_libdir}/libswrAVX.so.*
+#%{_libdir}/libswrAVX2.so.*
+#%endif
 %dir %{_libdir}/d3d
 %{_libdir}/d3d/d3dadapter9.so.*
 #%{_libdir}/bellagio/libomx_nouveau.la
@@ -610,8 +610,8 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %{_libdir}/d3d/d3dadapter9.so
 %ifnarch arm
 %{_includedir}/vulkan/vulkan_intel.h
-%{_libdir}/libswrAVX.so
-%{_libdir}/libswrAVX2.so
+#%{_libdir}/libswrAVX.so
+#%{_libdir}/libswrAVX2.so
 %endif
 #%{_libdir}/libdricore%{version}*.so
 #%{_libdir}/dri/gallium_drv_video.la
@@ -738,6 +738,12 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %endif
 
 %changelog
+* Sat Sep 08 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.1.8-2mamba
+- disable --with-gallium-driver=swr due to crashes on swrast (seen on Virtualbox guest)
+
+* Sat Sep 08 2018 Automatic Build System <autodist@mambasoft.it> 18.1.8-1mamba
+- automatic version update by autodist
+
 * Mon Sep 03 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 18.1.7-2mamba
 - rename libwayland-egl[-devel] to libwayland-egl-Mesa[-devel]