diff --git a/src/Makevars b/src/Makevars
index 3f2a7265..2edabeeb 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,2 +1,2 @@
-## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS=$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DR_NO_REMAP
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
index 1398ded9..2edabeeb 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,7 +1,2 @@
-
-## This assume that we can call Rscript to ask Rcpp about its locations
-## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS=$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-
-## Use C++11 compiler
-CXX_STD = CXX11
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DR_NO_REMAP
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)