diff --git a/flexpart_code/makefile.general.gfortran b/flexpart_code/makefile.general.gfortran
index 6acf74155bdb4e3b17ad9e441b4372e3acebfe81..8dbc6cadb3055ef4a07587d12398f0933b652684 100644
--- a/flexpart_code/makefile.general.gfortran
+++ b/flexpart_code/makefile.general.gfortran
@@ -4,34 +4,24 @@ GRIB2FLEXPART_EXECUTABLE = GRIB2FLEXPART_GFORTRAN
#############################################
#### Uncomment this to activate performance timing
-#DEFS = -DPERFTIMER -DCTBTO
#DEFS = -DPERFTIMER
-# DEFS = -DCTBTO
-DEFS =
#############################################
FC = gfortran
+PREFIX ?= /usr/local
-GRIB_API_ROOT = /dvlscratch/ATM/morton/usr/local/grib_api
+INCPATH = $(PREFIX)/include
+LIBPATH1 = -L$(PREFIX)/lib
-# NetCDF4 stuff
-NC4_ROOT = /dvlscratch/ATM/morton/usr/local
-NC4_INCLUDE_FLAGS = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
-NC4_LIB_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
- -L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
- -lnetcdff \
- -Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
- -L${NC4_ROOT}/netcdf-c-4.4.0/lib \
- -lnetcdf -lnetcdf
+## INTEL_ROOT=/path/to/intel/compiler/root
+## FC = $(INTEL_ROOT)/bin/ifort
+## LIBPATH2 = -Wl,-rpath=${INTEL_ROOT}/lib/intel64 -L${INTEL_ROOT}/lib/intel64
+## FFLAGS = -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+## default is 4 for frecord-marker
+FFLAGS = -O2 -mcmodel=medium -fconvert=little-endian -I$(INCPATH)
-INCPATH = ${GRIB_API_ROOT}/include
-LIBPATH1 = ${GRIB_API_ROOT}/lib
-#LIBPATH2 =
-
-FFLAGS = -O2 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -I$(INCPATH) ${NC4_INCLUDE_FLAGS}
-
-LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper ${NC4_LIB_FLAGS}
+LDFLAGS = $(FFLAGS) $(LIBPATH2) $(LIBPATH1) -lgrib_api_f90 -lgrib_api -ljasper -lnetcdff -lnetcdf -lnetcdf -lhdf5_hl -lhdf5 -ldl -lm -lcurl
MODOBJS = \
diff --git a/flexpart_code/makefile.general.ifort b/flexpart_code/makefile.general.ifort
index b7fe070d1dc13a3c51a82c3289324f193e490b80..e364cc8baabb6be0d9baed4ffced16c6515a0918 100644
--- a/flexpart_code/makefile.general.ifort
+++ b/flexpart_code/makefile.general.ifort
@@ -3,38 +3,23 @@ FLEXPART_EXECUTABLE = flexpart_ifort
GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
#############################################
-# DEFS = -DCTBTO
+#### Uncomment this to activate performance timing
+#DEFS = -DPERFTIMER
#############################################
-INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.14.2
-NC4_ROOT = /dvlscratch/ATM/morton/usrifort/local
+FC ?= ifort
+PREFIX ?= /usr/local
+INCPATH = $(PREFIX)/include
+LIBPATH1 = -L$(PREFIX)/lib
+## INTEL_ROOT=/path/to/intel/compiler/root
+## FC = $(INTEL_ROOT)/bin/ifort
+## LIBPATH2 = -Wl,-rpath=${INTEL_ROOT}/lib/intel64 -L${INTEL_ROOT}/lib/intel64
-FC = $(INTEL_ROOT)/bin/ifort
+FFLAGS = -O2 -mcmodel=medium -convert little_endian -I$(INCPATH)
-INCPATH = $(GRIB_API_ROOT)/fortran
-LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
-LIBPATH2 = $(GRIB_API_ROOT)/src/.libs
-
-LIBNC4_INCLUDES = -I${NC4_ROOT}/netcdf-fortran-4.4.3/include
-LIBNC4_FLAGS = -Wl,-rpath=${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
- -L${NC4_ROOT}/netcdf-fortran-4.4.3/lib \
- -lnetcdff \
- -Wl,-rpath=${NC4_ROOT}/netcdf-c-4.4.0/lib \
- -L${NC4_ROOT}/netcdf-c-4.4.0/lib \
- -lnetcdf -lnetcdf \
- -Wl,-rpath=${INTEL_ROOT}/lib/intel64 \
- -L${INTEL_ROOT}//lib/intel64 \
- -lifport -lifcore -limf -lsvml -lintlc
-
-
-
-FFLAGS = -O2 -mcmodel=medium -convert little_endian -I$(INCPATH) \
- ${LIBNC4_INCLUDES}
-
-LDFLAGS = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper ${LIBNC4_FLAGS}
+LDFLAGS = $(FFLAGS) $(LIBPATH2) $(LIBPATH1) -lgrib_api_f90 -lgrib_api -ljasper -lnetcdff -lnetcdf -lnetcdf -lhdf5_hl -lhdf5 -ldl -lm -lcurl
MODOBJS = \