diff --git a/.gitignore b/.gitignore
index 65e6b451bfc383da9e476ad9801cb73c809c2b0e..11ff982adb514f9d2f3534d7b0bd8f47a6fd0d6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ Test_*
 ALF_Doxygen_*
 Doxygen_Docu/*
 Analysis/cov_tau_ph.F90
-environment
+Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f490e13559974c22824fec793e83c6cae6318515..6275f24d58255ad790060b5fbe9ee1cb16b8d31a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
   stage: build
   <<: *exemptfiles_definition
   script:
-    - . configure.sh GNU serial
+    - ./configure.sh GNU serial
     - gfortran -v
     - make all
 
@@ -26,14 +26,14 @@ stages:
   script:
     - export PATH="/opt/pgi/linux86-64/2016/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make all
 
 .warnconv_template: &warnconv_definition
   stage: warnconv
   <<: *exemptfiles_definition
   script:
-    - . configure.sh Devel serial
+    - ./configure.sh Devel serial
     - gfortran -v
     - make all
 
@@ -41,7 +41,7 @@ stages:
   stage: test
   <<: *exemptfiles_definition
   script:
-    - . configure.sh Devel serial
+    - ./configure.sh Devel serial
     - gfortran -v
     - make lib
     - make ana
@@ -113,7 +113,7 @@ GQMCT_Stretch_MPI:
       - license.*
   script:
     - gfortran -v
-    - . configure.sh Devel Tempering
+    - ./configure.sh Devel Tempering
     - export ALF_FC="mpif90"
     - make all
 
@@ -161,7 +161,7 @@ GQMCT_Jessie-PGI_conv:
   script:
     - export PATH="/opt/pgi/linux86-64/2017/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make all
 
 GQMCT_Jessie_tests:
@@ -216,7 +216,7 @@ GQMCT_Jessie-PGI_tests:
   script:
     - export PATH="/opt/pgi/linux86-64/2016/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make lib
     - make ana
     - make Examples
@@ -237,7 +237,7 @@ GQMCT_Stretch_valgrind:
       - Libraries/Modules/*.(f|F)90
   script:
       - export ALF_FLAGS_EXT="-g"
-      - . configure.sh Devel serial
+      - ./configure.sh Devel serial
       - gfortran -v
       - make lib
       - make Examples
diff --git a/Makefile b/MakefileTemplate
similarity index 100%
rename from Makefile
rename to MakefileTemplate
diff --git a/Prog/main.F90 b/Prog/main.F90
index b4e9702a73c23af8ff8d5b43c3d06cce731b0221..91688bca9ffd17145a2ddbe44ceb23930a3625b4 100644
--- a/Prog/main.F90
+++ b/Prog/main.F90
@@ -713,3 +713,4 @@ Program Main
 #endif
         
       end Program Main
+
diff --git a/configure.sh b/configure.sh
index b524a05ee465c57fef05bfee93296fee93e4de28..e181b437a912b523ef660a9172d8beacb3f800a5 100755
--- a/configure.sh
+++ b/configure.sh
@@ -272,4 +272,11 @@ export ALF_FLAGS_MODULES
 export ALF_FLAGS_ANA
 export ALF_FLAGS_PROG
 
+env | awk '{print "export " $0}' > Makefile
+sed -i '/^export BASH_FUNC.*%%=()/d' Makefile
+sed -i '/^export }$/d' Makefile
+printf "\n" >> Makefile
+cat MakefileTemplate >> Makefile
+
 printf "\nTo compile your program use:    'make TARGET'\n\n"
+