diff --git a/Makefile b/Makefile
index 8066b0e2cc6a64add1ddecd292f047de2d13b306..ae453adc86ff81e56891243b1cdb9a4f660ea96a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,16 @@ EXEC = $(BINDIR)/helaz3
 EDBG = $(BINDIR)/helaz3_dbg
 
 F90 = mpiifort
-#F90 = ftn #for piz-daint cluster
-# Add Multiple-Precision Library
-EXTLIBS += -L$(FMDIR)/lib
-EXTINC += -I$(FMDIR)/mod
-
-EXTLIBS += -L$(FFTWDIR)/lib
-EXTINC += -I$(FFTWDIR)/include
+# #F90 = ftn #for piz-daint cluster
+# # Add Multiple-Precision Library
+# EXTLIBS += -L$(FMDIR)/lib
+# EXTINC += -I$(FMDIR)/mod
+# # Add local fftw dir
+# EXTLIBS += -L$(FFTWDIR)/lib
+# EXTINC += -I$(FFTWDIR)/include
+# # Add lapack
+# EXTLIBS += -L$(LAPACKDIR)/lib
+# EXTINC += -I$(LAPACKDIR)/mod
 
 all: dirs src/srcinfo.h
 all: F90FLAGS = -O3 -xHOST
diff --git a/local/dirs.inc b/local/dirs.inc
index 61da9e9fb7d44a01f1cee566af0887cb5f33b29e..3c5dca40e6a23ce33f5bf82929e62e097501c62a 100644
--- a/local/dirs.inc
+++ b/local/dirs.inc
@@ -10,5 +10,6 @@ FMDIR      = $(HOME)/lib/FM
 FFTW3DIR   = $(HOME)/lib/fftw-3.3.8
 #FFTW3DIR   = $(FFTW_HOME)#for Marconi
 FUTILS_DIR = $(HOME)/lib/futils/src
+#LAPACKDIR  = $(HOME)/lib/lapack
 
 # Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal)
diff --git a/local/make.inc b/local/make.inc
index e2c0cab82696f29593c14b3072a7804aaf1658c5..ccca69f3b37a6330dc8173ecabdea254f4f8e8cc 100644
--- a/local/make.inc
+++ b/local/make.inc
@@ -68,14 +68,24 @@ endif
 # Add Multiple-Precision Library
 LIBS += -lfm
 
-
+# Add FFTW3 local lib
 ifdef FFTW3DIR
       LIBS  += -lfftw3 -lfftw3_mpi
       LDIRS += -L$(FFTW3DIR)/lib
       IDIRS += -I$(FFTW3DIR)/include
 endif
 
+# Add lapack local lib
+ifdef LAPACKDIR
+      LIBS += -llapack -lblas
+      LDIRS += -L$(LAPACKDIR)/lib
+endif
 
+# FM library 
+ifdef FMDIR
+      LDIRS += -L$(FMDIR)/lib
+      IDIRS += -I$(FMDIR)/mod
+endif
 ################################################################
 #
 # Section V: Set up inclusion of modules and libraries during