diff --git a/doc/USER_MANUAL/02_getting_started.tex b/doc/USER_MANUAL/02_getting_started.tex
index c3b3f3656..6d618c991 100644
--- a/doc/USER_MANUAL/02_getting_started.tex
+++ b/doc/USER_MANUAL/02_getting_started.tex
@@ -59,6 +59,7 @@ \chapter{Getting Started}\label{cha:Getting-Started}
 
 If you have problems configuring the code on a Cray machine, i.e. for instance if you get an error message from the \texttt{configure} script, try exporting these two variables:
 \texttt{MPI\_INC=\${CRAY\_MPICH2\_DIR}/include and FCLIBS=" "}, and for more details if needed you can refer to the \texttt{utils/Cray\_compiler\_information} directory.
+You can also have a look at the configure script called \texttt{utils/Cray\_compiler\_information/configure\_SPECFEM\_for\_Piz\_Daint.bash}.
 
 On SGI systems, \texttt{flags.guess} automatically informs \texttt{configure}
 to insert `\texttt{`TRAP\_FPE=OFF}'' into the generated \texttt{Makefile}
diff --git a/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf b/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf
index 112d010f6..cffbacabf 100644
Binary files a/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf and b/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf differ
diff --git a/utils/Cray_compiler_information/configure_SPECFEM3D_for_Piz_Daint.bash b/utils/Cray_compiler_information/configure_SPECFEM3D_for_Piz_Daint.bash
deleted file mode 100755
index 793fcc6c3..000000000
--- a/utils/Cray_compiler_information/configure_SPECFEM3D_for_Piz_Daint.bash
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-mpif90=ftn
-mpicc=cc
-f90=ftn
-cc=cc
-
-# run flags
-#flags="-eF -em -rm"
-#cflags="-h list=m"
-
-## memory > 2GB
-#flags="-eF -em -rm -O3,fp3 -hpic -dynamic"
-#cflags="-h list=m -hpic -dynamic"
-
-# debug flags
-flags="-g -Rb -eF -rm -eC -eD" # -hfp2"
-cflags="-g -h list=m"
-
-###
-### CUDA
-###
-CUDA_INC="${CRAY_CUDATOOLKIT_DIR}/include"
-CUDA_LIB="${CRAY_CUDATOOLKIT_DIR}/lib64"
-
-###
-### mpi.h / mpif.h
-###
-MPI_INC="${CRAY_MPICH2_DIR}/include"
-
-./configure \
---with-cuda=cuda5 CUDA_INC="$CUDA_INC" CUDA_LIB="$CUDA_LIB" MPI_INC="$MPI_INC" \
-MPIFC=$mpif90 MPICC=$mpicc FC=$f90 CC=$cc CXX=$cc FLAGS_CHECK="$flags" CFLAGS="$cflags"
diff --git a/utils/Cray_compiler_information/configure_SPECFEM_for_Piz_Daint.bash b/utils/Cray_compiler_information/configure_SPECFEM_for_Piz_Daint.bash
new file mode 100755
index 000000000..f7e249659
--- /dev/null
+++ b/utils/Cray_compiler_information/configure_SPECFEM_for_Piz_Daint.bash
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+mpif90=ftn
+mpicc=cc
+f90=ftn
+cc=cc
+
+# run flags
+#flags="-eF -em -rm"
+#cflags="-h list=m"
+
+## memory > 2GB
+flags="-eF -em -rm -O3,fp3 -hpic -dynamic"
+cflags="-h list=m -hpic -dynamic"
+
+# debug flags
+#flags="-g -Rb -eF -rm -eC -eD" # -hfp2"
+#cflags="-g -h list=m"
+
+###
+### CUDA
+###
+CUDA_INC="${CRAY_CUDATOOLKIT_DIR}/include"
+CUDA_LIB="${CRAY_CUDATOOLKIT_DIR}/lib64"
+
+###
+### mpi.h / mpif.h
+###
+MPI_INC="${CRAY_MPICH2_DIR}/include"
+
+# DK DK June 2018: on Pascal P100 (for instance on Piz Daint in Switzerland) do *NOT* change --with-cuda=cuda8 below to --with-cuda=cuda9;
+# DK DK June 2018: only change that on machines that have Volta V100, not Pascal P100
+
+./configure \
+--with-cuda=cuda8 CUDA_INC="$CUDA_INC" CUDA_LIB="$CUDA_LIB" MPI_INC="$MPI_INC" \
+MPIFC=$mpif90 MPICC=$mpicc FC=$f90 CC=$cc CXX=$cc FLAGS_CHECK="$flags" CFLAGS="$cflags"
+