diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d90481206c28b3d0913cffd2be84c99f378db1ca..3920427cab679024c0d17d42a423a46d3214ace1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,7 @@ build:
     - DEBIAN_FRONTEND=noninteractive apt-get -qq install wget patch make gcc gfortran flex bison texlive autoconf autotools-dev
     - "[ -f ./version ] && export VERSION=$(cat ./version)"
   script:
-    - aclocal
-    - autoconf
-    - automake -a -c
-    - ./configure --prefix="$CI_PROJECT_DIR/build"
-    - make
-    - make install
-    - make dist
-    - make distcheck
+    - . build_dist.bash "$CI_PROJECT_DIR/build"
   artifacts:
     name: boxmox-dist-$CI_COMMIT_SHORT_SHA
     paths:
diff --git a/Makefile.am b/Makefile.am
index 473c369cd5ed726d8ac368265f90ef83be40d0f7..b572d85d9e28b4964289c13838b6919708f8df95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,6 @@
 SUBDIRS = src doc
 EXTRA_DIST = src/bison.h	src/code.h	src/gdata.h	src/gdef.h	src/scan.h
 
-nobase_dist_pkgdata_DATA = drv/boxmox_adjoint.f90 drv/boxmox.f90
-#drv examples case_studies int models util
-
 dist_doc_DATA = README.md
 dist_bin_SCRIPTS = scripts/list_BOXMOX_mechanisms \
 				   scripts/new_BOXMOX_experiment \
@@ -53,3 +50,6 @@ all-local:
 	@echo "export KPP_HOME=${prefix}"
 	@echo "export PATH=\$$KPP_HOME/bin:\$$KPP_HOME/boxmox/bin:\$$PATH"
 	@echo " "
+
+nobase_dist_pkgdata_DATA = drv/boxmox_adjoint.f90 drv/boxmox.f90
+#drv examples case_studies int models util
diff --git a/build_dist.bash b/build_dist.bash
new file mode 100755
index 0000000000000000000000000000000000000000..f2849ba2145a111ea2ed05c868e06b891f2aa42a
--- /dev/null
+++ b/build_dist.bash
@@ -0,0 +1,11 @@
+#!/bin/sh
+buildDir=$1
+
+aclocal
+autoconf
+automake -a -c
+./configure --prefix="${buildDir}"
+make
+make install
+make dist
+make distcheck
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f57b26a062ee0930969f861be02332e7ff01c23..9ad867af8543ce04e45795993f7b443ca8b988c3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
-doc_DATA = kpp_UserManual.pdf
+docfiles = kpp_UserManual.pdf
 
 if HAVE_PDFLATEX
-doc_DATA +=  boxmox_UserManual.pdf
+docfiles +=  boxmox_UserManual.pdf
 boxmox_UserManual.pdf : boxmox_UserManual.tex
 	@pdflatex@ $<
 	@pdflatex@ $<
@@ -10,4 +10,4 @@ clean-local:
 	rm -f *.log *.out *.toc *.aux boxmox_UserManual.pdf
 endif
 
-dist_doc_DATA = $(doc_DATA)
\ No newline at end of file
+doc_DATA = $(docfiles)
\ No newline at end of file