diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f545eb3b8f54f58f98c686ff263b14b92102bbcd..d1d65962398d97e500204d15de1db3ef541653e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,8 @@ image: blang/latex
 
 build:
   script:
-    - ./build.sh
+    - make
+    - move-pdf.sh
   artifacts:
     paths:
       - "*.pdf"
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..dd429054caac4cf5a710200e20d9abb15ea1c211
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+.PHONY: all
+all:
+	$(MAKE) -C administrativt
+	$(MAKE) -C infomöte
+	$(MAKE) -C tilde
diff --git a/administrativt/Makefile b/administrativt/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a57a25c6a44f174bfbd7fba51aa37970bca448d9
--- /dev/null
+++ b/administrativt/Makefile
@@ -0,0 +1,4 @@
+.PHONY: all
+all:
+	$(MAKE) -C medlemslapp
+	$(MAKE) -C kortlapp
diff --git a/administrativt/kortlapp/Makefile b/administrativt/kortlapp/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d8551614d3200a4eddfd377a0179101aeeb526f9
--- /dev/null
+++ b/administrativt/kortlapp/Makefile
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+	latexmk -pdf
diff --git a/administrativt/medlemslapp/Makefile b/administrativt/medlemslapp/Makefile
index c16d70e456411e5cd7fb0ba5890df1e236d20a4e..1434772a485ca2bdb5e3457bb920aec10f662f00 100644
--- a/administrativt/medlemslapp/Makefile
+++ b/administrativt/medlemslapp/Makefile
@@ -1,18 +1,2 @@
-all: villkor.ps conditions.ps
-
-villkor.ps: villkor.dvi
-	dvips -D600 -o villkor.ps villkor.dvi
-
-villkor.dvi: villkor.latex
-	latex villkor.latex
-
-conditions.ps: conditions.dvi
-	dvips -D600 -o conditions.ps conditions.dvi
-
-conditions.dvi: conditions.latex
-	latex conditions.latex
-
-clean:
-	for i in dvi ps aux log ; do rm -f villkor.$$i conditions.$$i; done
-	rm -f *~ core
-
+all:
+	latexmk -pdf
diff --git a/administrativt/medlemslapp/conditions.latex b/administrativt/medlemslapp/conditions.tex
similarity index 92%
rename from administrativt/medlemslapp/conditions.latex
rename to administrativt/medlemslapp/conditions.tex
index 8a36f5b8f86999319404d1877a417b3208eab42c..8d398bfc6c0e3bc007040c3de063b785ef44dd94 100644
--- a/administrativt/medlemslapp/conditions.latex
+++ b/administrativt/medlemslapp/conditions.tex
@@ -7,10 +7,10 @@
 \textheight 25cm
 \pagestyle{empty}
 \begin{document}
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
-      \vspace{-5cm}
-      \epsfbox{lyslogo.ps}}
+%\epsfysize 30 mm
+% \mbox{\hspace{8cm}
+%       \vspace{-5cm}
+%       \epsfbox{lyslogo.ps}}
 
 \section*{Terms for accounts (v1.3)}
 
@@ -61,12 +61,12 @@ Lysators computers, and so that Lysator may keep its good network
 connection. We risk losing the connection unless we behave.
 
 \newpage
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
-      \vspace{-5cm}
-      \epsfbox{lyslogo.ps}}
-\vspace{-5ex}
-\section*{FIlled in by the applicant}
+%\epsfysize 30 mm
+%\mbox{\hspace{8cm}
+%      \vspace{-5cm}
+%      \epsfbox{lyslogo.ps}}
+%\vspace{-5ex}
+\section*{Filled in by the applicant}
 
 \renewcommand{\arraystretch}{2.57}
 \fbox{
diff --git a/administrativt/medlemslapp/villkor.latex b/administrativt/medlemslapp/villkor.tex
similarity index 100%
rename from administrativt/medlemslapp/villkor.latex
rename to administrativt/medlemslapp/villkor.tex
diff --git a/build.sh b/build.sh
deleted file mode 100755
index de802b5db67440c22d144b7c6ffd192ffdfd3f2c..0000000000000000000000000000000000000000
--- a/build.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-pushd administrativt/kortlapp/ 
-latexmk -pdf
-popd
-
-pushd administrativt/medlemslapp/
-latexmk -pdf vilkor.latex
-latexmk -pdf conditions.latex
-popd
-
-pushd infomöte
-latexmk -pdf single
-popd
-
-pushd infomöte
-latexmk -pdf multi
-popd
-
-pushd infomöte/presentation
-latexmk -pdf
-popd
-
-pushd tilde
-latexmk -pdf
-popd
-
-for f in `find -name \*.pdf`; do
-	mv $f $(basename $f)
-done
diff --git "a/infom\303\266te/Makefile" "b/infom\303\266te/Makefile"
new file mode 100644
index 0000000000000000000000000000000000000000..ee2a453cf5b16c71c7bee4e192ebeec2c36074a4
--- /dev/null
+++ "b/infom\303\266te/Makefile"
@@ -0,0 +1,8 @@
+.PHONY: all
+all: multi.pdf
+	$(MAKE) -C presentation
+
+multi.pdf: single.pdf
+
+%.pdf: %.tex
+	latexmk -pdf $<
diff --git "a/infom\303\266te/presentation/Makefile" "b/infom\303\266te/presentation/Makefile"
new file mode 100644
index 0000000000000000000000000000000000000000..d8551614d3200a4eddfd377a0179101aeeb526f9
--- /dev/null
+++ "b/infom\303\266te/presentation/Makefile"
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+	latexmk -pdf
diff --git a/move-pdf.sh b/move-pdf.sh
new file mode 100755
index 0000000000000000000000000000000000000000..84d45a11475c40d7d3ad9a34a1e3ae148ca6a016
--- /dev/null
+++ b/move-pdf.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for f in `find -name \*.pdf`; do
+	mv $f $(basename $f)
+done
diff --git a/tilde/Makefile b/tilde/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d8551614d3200a4eddfd377a0179101aeeb526f9
--- /dev/null
+++ b/tilde/Makefile
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+	latexmk -pdf