diff --git a/petsc.spec b/petsc.spec
index ac2d6ac..4f8562e 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -82,7 +82,7 @@
 # 'scalapack' is required by 'mumps'
 %if %{with openmpi}
 %bcond_without mpi
-%bcond_without sundials
+%bcond_with sundials
 %bcond_without scalapack
 %bcond_without mumps
 %bcond_without ptscotch
@@ -91,7 +91,7 @@
 
 %if %{with mpich}
 %bcond_without mpi
-%bcond_without sundials
+%bcond_with sundials
 %bcond_without scalapack
 %bcond_without mumps
 %bcond_without ptscotch
@@ -385,8 +385,8 @@ pushd %{name}-%{version}
 CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
  CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
 %else
-CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
- COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
 %endif
  --with-default-arch=0 --with-make=1 \
  --with-single-library=1 \
@@ -431,7 +431,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %if %{with mumps_serial}
  --with-mumps-serial=1 \
  --with-mumps-include=%{_includedir}/MUMPS \
- --with-mumps-lib="-lmumps_common -ldmumps -lpord" \
+ --with-mumps-lib=-ldmumps \
 %endif
  --with-mpi=0 \
  --with-x=1 \
@@ -464,8 +464,8 @@ pushd build64
 CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
  CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
 %else
-CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
- COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
 %endif
  --with-default-arch=0 --with-make=1 \
  --with-single-library=1 \
@@ -525,8 +525,8 @@ pushd buildopenmpi_dir
 CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
  CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
 %else
-CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
- COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
 %endif
  --with-default-arch=0 --with-make=1 \
  --with-single-library=1 \
@@ -575,28 +575,28 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with cgns}
  --with-cgns=1 \
- --with-cgns-include="" \
+ --with-cgns-include= \
  --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
 %endif
 %if %{with hdf5}
  --with-hdf5=1 \
- --with-hdf5-include="" \
+ --with-hdf5-include= \
  --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
 %endif
 %if %{with ptscotch}
  --with-ptscotch=1 \
- --with-ptscotch-include="" \
+ --with-ptscotch-include= \
  --with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr" \
 %endif
 %if %{with mumps}
  --with-mumps=1 \
- --with-mumps-include="" \
- --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
+ --with-mumps-include=$MPI_INCLUDE \
+ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
 %endif
 %if %{with sundials}
  --with-sundials=1 \
- --with-sundials-include="" \
- --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-include= \
+ --with-sundials-lib=-lsundials_nvecparallel \
 %endif
 %if %{with superludist}
  --with-superlu_dist=1 \
@@ -615,7 +615,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with fftw}
  --with-fftw=1 \
- --with-fftw-include="" \
+ --with-fftw-include= \
  --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
 %endif
  --with-pthread=1 \
@@ -637,7 +637,7 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
  CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
 %else
 CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
- COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
 %endif
  --with-default-arch=0 --with-make=1 \
  --with-single-library=1 \
@@ -686,12 +686,12 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with cgns}
  --with-cgns=1 \
- --with-cgns-include="" \
+ --with-cgns-include= \
  --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
 %endif
 %if %{with hdf5}
  --with-hdf5=1 \
- --with-hdf5-include="" \
+ --with-hdf5-include= \
  --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
 %endif
 %if %{with ptscotch}
@@ -701,13 +701,13 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with mumps}
  --with-mumps=1 \
- --with-mumps-include="" \
- --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
+ --with-mumps-include=$MPI_INCLUDE \
+ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
 %endif
 %if %{with sundials}
  --with-sundials=1 \
- --with-sundials-include="" \
- --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-include= \
+ --with-sundials-lib=-lsundials_nvecparallel \
 %endif
 %if %{with superludist}
  --with-superlu_dist=1 \
@@ -726,7 +726,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with fftw}
  --with-fftw=1 \
- --with-fftw-include="" \
+ --with-fftw-include= \
  --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
 %endif
  --with-pthread=1 \
@@ -1022,6 +1022,7 @@ make -C buildmpich_dir test
 %changelog
 * Wed Nov 08 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-3
 - Rebuild for hypre-2.13.0
+- Disable sundials on MPI builds
 
 * Sun Oct 29 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-2
 - Define openblas arches