diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87f3d77c1..017bd5c9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,7 +334,6 @@ ELSE(CMAKE_TOOLCHAIN_FILE)
         ENDFOREACH(type)
       ELSE(QMC_BUILD_STATIC)
         MESSAGE(STATUS "Building CPU code. Linking dynamically.")
-        SET(CMAKE_EXE_LINKER_FLAGS "-dynamic")
       ENDIF(QMC_BUILD_STATIC)
     ENDIF(QMC_CUDA)
   ENDIF($ENV{CRAYPE_VERSION} MATCHES ".")
diff --git a/config/build_olcf_eos.sh b/config/build_olcf_eos.sh
index 72bafd20a..af2f59ba3 100755
--- a/config/build_olcf_eos.sh
+++ b/config/build_olcf_eos.sh
@@ -29,6 +29,10 @@ if (echo $LOADEDMODULES | grep -q hdf5)
 then
 module unload cray-hdf5
 fi
+if (echo $LOADEDMODULES | grep -q libsci)
+then
+module unload cray-libsci
+fi
 module load PrgEnv-intel
 module load gcc
 module load cray-hdf5-parallel
@@ -37,6 +41,8 @@ module load boost
 module load subversion
 module load cmake
 
+# always dynamic linking
+export CRAYPE_LINK_TYPE=dynamic
 
 # Set environment variables
 export FFTW_HOME=$FFTW_DIR/..
diff --git a/config/build_olcf_titan.sh b/config/build_olcf_titan.sh
index 578b6acc8..cec708068 100755
--- a/config/build_olcf_titan.sh
+++ b/config/build_olcf_titan.sh
@@ -31,8 +31,10 @@ module load cray-hdf5-parallel
 module load fftw
 module load boost
 module load subversion
-module load cmake/2.8.11.2
+module load cmake3/3.6.1
 
+# always dynamic linking
+export CRAYPE_LINK_TYPE=dynamic
 
 # Set environment variables
 export FFTW_HOME=$FFTW_DIR/..
diff --git a/manual/installation.tex b/manual/installation.tex
index 9c9b7c11b..bc0a91a6d 100644
--- a/manual/installation.tex
+++ b/manual/installation.tex
@@ -585,6 +585,7 @@ Theta is a 9.65 petaflops system manufactured by Cray with 3624 compute nodes.
 Each node features a second-generation Intel Xeon Phi 7230 processor and 192 GB DDR4 RAM.
 
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
 module unload cray-libsci
 module load cray-hdf5-parallel
 export BOOST_ROOT=/soft/libraries/boost/1.64.0/intel
@@ -628,6 +629,7 @@ As noted in Section\ref{sec:titanbuildgpu} for the GPU, building on
 Crays requires only loading the appropriate library modules.
 
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
 module swap PrgEnv-pgi PrgEnv-gnu # Use gnu compilers
 module unload cudatoolkit         # No CUDA for CPU build
 module load cray-hdf5
@@ -648,6 +650,8 @@ by the Aries interconnect. The build process is identical to Titan,
 except that we use the default Intel programming environment. This is
 usually preferred to GNU.
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
+module unload cray-libsci
 module load cray-hdf5
 module load cmake
 module load fftw
@@ -697,12 +701,12 @@ Edison is a Cray XC30 with dual 12-core Intel "Ivy Bridge" nodes
 installed at NERSC. The build settings are identical to eos.
 
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
+module unload cray-libsci
 module load boost
-module load cmake3
 module load cmake
 module load libxml2
 module load cray-hdf5-parallel
-module unload cray-libsci
 cmake ..
 make -j 8
 ls -l bin/qmcpack
@@ -732,6 +736,7 @@ Cori is a Cray XC40 with 16-core Intel "Haswell" nodes
 installed at NERSC.
 
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
 module unload cray-libsci  
 module load boost  
 module load cray-hdf5-parallel
@@ -770,6 +775,7 @@ Xeon Phi Knight's Landing (KNL) nodes. The following build recipe ensures that t
 generation is appropriate for the KNL nodes:
 
 \begin{verbatim}
+export CRAYPE_LINK_TYPE=dynamic
 module swap craype-haswell craype-mic-knl  
 module unload cray-libsci  
 module load boost