diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46cdfc40b..88a73d0a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ before_script:
   - apt-get install -y -qq pkg-config
   - apt-get install -y -qq build-essential
   - apt-get install -y -qq cmake
+  - apt-get install -y -qq doxygen graphviz
   - apt-get install -y -qq libglm-dev libassimp-dev lua5.3 liblua5.3-dev libsdl2-dev postgresql-server-dev-9.5 libpq-dev libenet-dev doxygen
   - cmake --version
 
@@ -13,3 +14,13 @@ build:
   script:
     - make -j 4
     - make tests ARGS="--gtest_filter=-DatabaseModelTest.*:ConnectionPoolTest.*:WorldRendererTest.testCreate"
+
+pages:
+  script:
+    - make doc
+    - mv build-debug/html/ public/
+  artifacts:
+    paths:
+    - public
+  only:
+    - master
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ebf86d802..0e008755b 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,9 @@ clean-local-config:
 edit-local-config:
 	$(Q)$(EDITOR) $(LOCAL_CONFIG_DIR)/shapetool/shapetool.vars
 
+doc:
+	$(Q)$(MAKE) $(MAKE_OPTIONS) doc
+
 server client shapetool shadertool noisetool databasetool uitool tests testmesh testdepthbuffer testtexture flatc: cmake
 	$(Q)$(MAKE) $(MAKE_OPTIONS) $@ copy-data-shared copy-data-$@ $(JOB_FLAG)
 	$(Q)cd $(BUILDDIR); $(VALGRIND_CMD) $(GDB_CMD) $(VOGL_CMD) ./$@ $(ARGS)