diff --git a/configure b/configure
index 154870b..1a9f092 100755
--- a/configure
+++ b/configure
@@ -7,12 +7,6 @@ if test -z "${CMAKE_BIN}"; then
 fi
 export PATH=$PATH:$(cd $(dirname -- $CMAKE_BIN) && pwd -P)
 
-## Set R_HOME, respecting an environment variable if set
-: ${R_HOME=$(R RHOME)}
-if test -z "${R_HOME}"; then
-   as_fn_error $? "Could not determine R_HOME." "$LINENO" 5
-fi
-
 tools/r_config.sh
 
 # It is required that setup.sh is run before R CMD build rlibkriging when submit to CRAN. 
diff --git a/tools/build.sh b/tools/build.sh
index 4c1feb3..4252906 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -42,7 +42,7 @@ export Fortran_LINK_FLAGS="$(${R_HOME}/bin/R CMD config FLIBS)"
 echo "----------------------------------------------------------------"
 echo "Look for HDF5 installation"
 # Get HDF5 installation if available from R package Rhdf5lib
-RHDF5_PATH=$(${R_HOME}/bin/Rscript -e "system.file(package='Rhdf5lib')" | sed -e 's/^\[[0-9]\] "//' | sed -e 's/"$//')
+RHDF5_PATH=$(${R_HOME}/bin/R -e "system.file(package='Rhdf5lib')" | sed -e 's/^\[[0-9]\] "//' | sed -e 's/"$//')
 if [ -n "${RHDF5_PATH}" ]; then
   rm -fr ../../inst/hdf5
   mkdir -p ../../inst/hdf5
@@ -73,6 +73,6 @@ mv build/installed/include ../../inst/.
 cd ../..
 
 # update doc
-#Rscript -e "roxygen2::roxygenise(package.dir = '.')" # No: it will loop on install, because roxygen2 requires loading package...
+#R -e "roxygen2::roxygenise(package.dir = '.')" # No: it will loop on install, because roxygen2 requires loading package...
 # update Rccp links
-${R_HOME}/bin/Rscript -e "Rcpp::compileAttributes(pkgdir = '.', verbose = TRUE)"
+${R_HOME}/bin/R -e "Rcpp::compileAttributes(pkgdir = '.', verbose = TRUE)"
diff --git a/tools/setup.sh b/tools/setup.sh
index 006e879..53d5a07 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -114,5 +114,5 @@ rm -rf tests/test-KrigingCholCrash.R
 
 # sync man content
 rm -rf man
-"${R_HOME}"/bin/Rscript -e "roxygen2::roxygenise(package.dir = '.')"
+"${R_HOME}"/bin/R -e "roxygen2::roxygenise(package.dir = '.')"
 rm -rf $LIBKRIGING_SRC_PATH/build