diff --git a/Makefile b/Makefile
index a765b45e80aef92b93121accadcccee9eccd5af1..fd27c9cf96eb53dd9679f8a977377aa05fad0da4 100644
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,11 @@ include buildsystem/Makefile.comp.gcc
 include buildsystem/Makefile.path.bwforcluster
 endif
 
+ifeq ($(SYSTYPE),"Leonardo")
+include buildsystem/Makefile.comp.gcc
+include buildsystem/Makefile.path.leonardo
+endif
+
 
 ifndef LINKER
 LINKER = $(CPP)
diff --git a/Template-Makefile.systype b/Template-Makefile.systype
index 735b4b6b6ff65c6a723bbe58972446a3dd38ebc6..c92d495f9f319b56c0e22a76eb5225a23cd72c03 100644
--- a/Template-Makefile.systype
+++ b/Template-Makefile.systype
@@ -14,4 +14,5 @@
 #SYSTYPE="libs"
 #SYSTYPE="hydra"
 #SYSTYPE="bwforcluster"
+#SYSTYPE="Leonardo"
 
diff --git a/buildsystem/Makefile.path.leonardo b/buildsystem/Makefile.path.leonardo
new file mode 100644
index 0000000000000000000000000000000000000000..43c5fc0a3421049eb75c0ac03d5cfb1f60b2d42b
--- /dev/null
+++ b/buildsystem/Makefile.path.leonardo
@@ -0,0 +1,11 @@
+GSL_INCL   =  -I$(GSL_BASE)/include
+GSL_LIBS   =  -L$(GSL_BASE)/lib  -Xlinker -R -Xlinker $(GSL_BASE)/lib
+FFTW_INCL  =  -I$(FFTW_BASE)/include
+FFTW_LIBS  =  -L$(FFTW_BASE)/lib  -Xlinker -R -Xlinker $(FFTW_BASE)/lib
+HDF5_INCL  =  -I$(HDF5_BASE)/include
+HDF5_LIBS  =  -L$(HDF5_BASE)/lib -Xlinker -R -Xlinker $(HDF5_BASE)/lib
+HWLOC_INCL =  
+HWLOC_LIBS =  
+MAPS_INCL  =  
+MAPS_LIBS  = 
+