diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3200b010..69f3df66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+variables:
+    GIT_SUBMODULE_STRATEGY: normal
+
 stages:
     - build
     - pages
diff --git a/Makefile b/Makefile
index 34b74cae..09f601e5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ endif
 
 .PHONY:	all tools grafx2 ziprelease 3rdparty win32installer \
         doc doxygen docarchive doxygenarchive htmldoc \
-        updateversion
+        updateversion unicodefonts
 
 all:	grafx2 tools
 
@@ -13,9 +13,12 @@ doc:	doxygen
 
 docarchive:	doxygenarchive
 
-grafx2:
+grafx2:	unicodefonts
 	$(OPT)$(MAKE) -C src/
 
+unicodefonts:
+	$(MAKE) -C tools/8x8fonts/
+
 ziprelease: grafx2
 	$(OPT)$(MAKE) -C src/ ziprelease
 
diff --git a/appveyor.yml b/appveyor.yml
index e7e79f91..bf260dde 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,5 @@
 install:
+  - git submodule update --init --recursive
   - set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%
   - mingw32-make -v
   - make -v
@@ -20,3 +21,6 @@ artifacts:
     name: GrafX2 portable installation
   - path: 'install\*.exe'
     name: GrafX2 installer
+
+on_failure:
+  - 'dir /S tools'