diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index e1bf20d67..1a2ac1c61 100644
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -569,7 +569,7 @@ recover: $(U)recover.exe
 	@$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
 	@$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR))
 
-$(O)install.tag: $(O)dat.tag $(GAMEFILE)
+$(O)install.tag: $(O)dat.tag $(O)fonts.tag $(GAMEFILE)
 ifeq ($(USE_DLB),Y)
 	@$(subst /,\,copy $(DAT)/nhdat $(GAMEDIR))
 	@$(subst /,\,copy $(DAT)/license $(GAMEDIR))
@@ -595,6 +595,9 @@ ifdef CWSDPMI
 	@$(subst /,\,if exist $(CWSDPMI) copy $(CWSDPMI) $(GAMEDIR))
 else
 	@$(subst /,\,echo Could not find a copy of CWSDPMI.EXE to put into $(GAMEDIR))
+endif
+ifdef WANT_DOSVGA
+	@$(subst /,\,copy $(MSYS)/fonts/*.psf  $(GAMEDIR))
 endif
 	@$(subst /,\,echo install done > $@)
 
@@ -913,6 +916,26 @@ $(O)lua$(LUAVER)s.a: $(LUAOBJFILES)
 $(O)lua.o: $(LUASRC)/lua.c
 $(O)luac.o: $(LUASRC)/luac.c
 
+#==========================================
+#  Fonts for Unicode support
+#==========================================
+
+ifdef WANT_DOSVGA
+$(O)fonts.tag: lua.exe $(MSYS)/fonts/makefont.lua
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u16b.bdf $(MSYS)/fonts/ter-u16b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u16v.bdf $(MSYS)/fonts/ter-u16v.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u18b.bdf $(MSYS)/fonts/ter-u18b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u20b.bdf $(MSYS)/fonts/ter-u20b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u22b.bdf $(MSYS)/fonts/ter-u22b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u24b.bdf $(MSYS)/fonts/ter-u24b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u28b.bdf $(MSYS)/fonts/ter-u28b.psf
+	lua $(MSYS)/fonts/makefont.lua $(MSYS)/fonts/ter-u32b.bdf $(MSYS)/fonts/ter-u32b.psf
+	@echo Fonts done >$(O)fonts.tag
+else
+$(O)fonts.tag:
+	@echo Fonts not needed >$(O)fonts.tag
+endif
+
 #==========================================
 #  Housekeeping.
 #==========================================
@@ -920,6 +943,8 @@ $(O)luac.o: $(LUASRC)/luac.c
 clean:
 	$(subst /,\,if exist $(O)*.o del $(O)*.o)
 	$(subst /,\,if exist $(O)dat.tag del $(O)dat.tag)
+	$(subst /,\,if exist $(O)fonts.tag del $(O)fonts.tag)
+	$(subst /,\,if exist $(MSYS)/fonts/*.psf del $(MSYS)/fonts/*.psf)
 	$(subst /,\,if exist $(O)install.tag del $(O)install.tag)
 	$(subst /,\,if exist $(O)$(GAME).lnk del $(O)$(GAME).lnk)
 	$(subst /,\,if exist $(O)obj.tag del $(O)obj.tag)