diff --git a/src/Makefile b/src/Makefile
index 2cf1ace502a7e2e4b08d327cf0842c2af1407917..e6032377ec1b3c6a829d90d64967579767de7bf2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,8 +10,10 @@ endif
 ifndef LIBNPTM
 ifdef STATIC_NPTM
 override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.a
+override STATICFLAG="-lsz -lz -laec -static"
 else
 override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.so
+override STATICFLAG=""
 endif
 endif
 DOCSDIR=$(SRCDIR)/../doc
@@ -30,7 +32,7 @@ $(LIBNPTM):
 	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C libnptm $@
 
 $(SUBDIRS): $(BUILDDIR) $(LIBNPTM)
-	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C $@
+	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) STATICFLAG=$(STATICFLAG) $(MAKE) -C $@
 
 clean: $(BUILDDIR)
 	BUILDDIR=$(BUILDDIR) $(MAKE) -C cluster clean
diff --git a/src/include/clu_subs.h b/src/include/clu_subs.h
index 2e57fa71c3a55c7cffbd68a68b7bec5ccaa15b8e..4621148a45de3fcd4b0107d449dbff454fd66ed3 100644
--- a/src/include/clu_subs.h
+++ b/src/include/clu_subs.h
@@ -379,7 +379,7 @@ void tqr(
 
 /*! \brief Calculate the single-centered inversion of the M-matrix.
  *
- * This function computes the single-centered inverrted M-matrix appearing in Eq. (5.28)
+ * This function computes the single-centered inverted M-matrix appearing in Eq. (5.28)
  * of Borghese, Denti & Saija (2007).
  *
  * \param am: `complex double **`
diff --git a/src/make.inc b/src/make.inc
index 2ba3d6b135da8c1627da9b0e5504c6c266cc8777..1d7b99e0bbeb6052302f009f7d3b2f3f57547383 100644
--- a/src/make.inc
+++ b/src/make.inc
@@ -79,6 +79,9 @@ override CXXFLAGS+= -DUSE_LAPACK -DLAPACK_ILP64
 ifdef USE_MKL
 override CXXFLAGS+= -DMKL_ILP64 -DUSE_MKL -I$(MKLROOT)/include
 endif
+ifdef USE_OPENMP
+override CXXFLAGS+= -fopenmp
+endif
 endif
 endif
 
@@ -88,9 +91,12 @@ ifndef CXXLDFLAGS
 ifndef HDF5_LIB
 override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial
 endif
-override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5
+override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(STATICFLAG)
 ifdef USE_LAPACK
 override CXXLDFLAGS+= $(LAPACK_LDFLAGS)
+ifdef USE_OPENMP
+override CXXLDFLAGS+= -lopenblas64
+endif
 endif
 override CXXLDFLAGS+= $(LDFLAGS)
 endif