diff --git a/ChangeLog b/ChangeLog
index 36d9173..4a91247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Release 0.5-0:
   * Cleaned up some internal issues.
   * Initial support for BLACS contexts with multiple MPI communicators.
   * Fixed Windows build issue (Jeroen Ooms).
+  * Fix OMP flags issue.
 
 Release 0.4-6:
   * Fix indexing problem in pdsweep()
diff --git a/src/Makevars.in b/src/Makevars.in
index 3a21d64..6935f2d 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,36 +1,22 @@
-#################################################################
-
-### MPI+SLAP
 SPMD_CPPFLAGS = @SPMD_CPPFLAGS@
 SPMD_LDFLAGS = @SPMD_LDFLAGS@
 
 SLAP_LDFLAGS = @SLAP_LDFLAGS@
 
 
-### Package flags.
 PKG_CPPFLAGS = $(SPMD_CPPFLAGS) -I../inst/RNACI
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) 
-PKG_FFLAGS = $(SHLIB_OPENMP_FFLAGS) 
-PKG_FCFLAGS = $(SHLIB_OPENMP_FCFLAGS) 
-
-
-PKG_LIBS = $(SLAP_LDFLAGS) $(FLIBS) $(SPMD_LDFLAGS) \
-					 $(SHLIB_OPENMP_CFLAGS)
+PKG_LIBS = $(SLAP_LDFLAGS) $(FLIBS) $(SPMD_LDFLAGS)
 
 
-### Setup R source code and objects.
-
 BASE_OBJS = \
 		base/bprnt.o \
 		base/bprnt_c.o
 
-
 EXPM_OBJS = \
 		base/expm/pade_coefs.o \
 		base/expm/matexp.o \
 		base/expm/p_matexp.o
 
-
 LINALG_OBJS = \
 		base/linalg/norms.o \
 		base/linalg/pcrossprod.o \
@@ -38,7 +24,6 @@ LINALG_OBJS = \
 		base/linalg/prblas.o \
 		base/linalg/plm.o
 
-
 MISC_OBJS = \
 		coords.o \
 		comm_utils.o
@@ -49,7 +34,6 @@ EXPORT_BLACS = @EXPORT_BLACS@
 STATS_OBJS = \
 		base/stats/variance.o
 
-
 UTILS = \
 		utils/fpmod.o \
 		utils/quicksort_utils.o \
@@ -65,8 +49,6 @@ EXPERIMENTAL = \
 		utils/subset_special.o \
 		utils/subset_utils.o
 
-
-
 UTILS_OBJS = \
 		base/utils/blacs_util.o \
 		base/utils/dmat_redist.o \
@@ -76,7 +58,6 @@ UTILS_OBJS = \
 		base/utils/scale.o \
 		base/utils/special.o
 
-
 R_OBJS = \
 		base_lm.o \
 		base_matexp.o \
@@ -97,7 +78,6 @@ R_OBJS = \
 		descinit.o \
     pbdBASE_native.o
 
-
 OBJECTS = $(BASE_OBJS) $(EXPM_OBJS) $(LINALG_OBJS) \
 					$(MISC_OBJS) $(EXPORT_BLACS) \
 					$(R_OBJS) $(STATS_OBJS) \
diff --git a/src/Makevars.win b/src/Makevars.win
index 94ae4ed..5cb4c84 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -15,12 +15,7 @@ MPI_LIB = $(shell ${R_SCMD} \
 
 ### Setup R package flags and substitute by configure for ${MPI_...}.
 PKG_CPPFLAGS = -I"$(MPI_INCLUDE)"  -I../inst/RNACI
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) 
-PKG_FFLAGS = $(SHLIB_OPENMP_FFLAGS) 
-PKG_FCFLAGS = $(SHLIB_OPENMP_FCFLAGS) 
-### Order is matter.
-PKG_LIBS = "$(SLAP_LDFLAGS)" $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
-           "$(MPI_LIB)" $(RNACI_LDFLAGS) $(SHLIB_OPENMP_CFLAGS)
+PKG_LIBS = "$(SLAP_LDFLAGS)" $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) "$(MPI_LIB)" $(RNACI_LDFLAGS)
 
 ### Setup R source code and objects.
 R_SRCS_C = $(wildcard *.c) \