diff --git a/CMakeLists.txt b/CMakeLists.txt
index 138be47..315eb34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,10 @@ check_symbol_exists(uname "sys/utsname.h" HAVE_UNAME)
 if (EMSCRIPTEN)
   set(SDL2_FOUND 1)
   set(FREETYPE_FOUND 1)
-  set(DEFAULT_FONT_PATH .)
 elseif (ANDROID)
   set(SDL2_FOUND 1)
   set(SDL2MIXER_FOUND 1)
   set(SDL2TTF_FOUND 1)
-  set(DEFAULT_FONT_PATH .)
   find_library(ndk_zlib z)
   find_library(ndk_log log)
 else()
@@ -79,7 +77,7 @@ else()
   optional_pkg_check_modules(SDL2MIXER IMPORTED_TARGET SDL2_mixer)
   optional_pkg_check_modules(SDL2TTF IMPORTED_TARGET SDL2_ttf)
 
-  set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/xsystem35/fonts)
+  set(DEFAULT_FONT_PATH ${CMAKE_INSTALL_PREFIX}/share/xsystem35/fonts/)
 endif()
 
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e3a4368..0623ba6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -34,6 +34,12 @@ android {
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
         sourceSets.main {
             jniLibs.srcDir 'libs'
+            assets.srcDir '../../fonts'
+        }
+        aaptOptions {
+            // Disable asset compression for fonts.
+            // Without this, text rendering will be very slow.
+            noCompress 'ttf'
         }
         externalNativeBuild {
             cmake {
diff --git a/config.h.in b/config.h.in
index 8cd8f4d..c20a20e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -38,5 +38,5 @@
 #cmakedefine HAVE_UNAME @HAVE_UNAME@
 #cmakedefine HAVE_XF86VMODE @HAVE_XF86VMODE@
 
-#define DEFAULT_GOTHIC_TTF "@DEFAULT_FONT_PATH@/MTLc3m.ttf"
-#define DEFAULT_MINCHO_TTF "@DEFAULT_FONT_PATH@/mincho.otf"
+#define DEFAULT_GOTHIC_TTF "@DEFAULT_FONT_PATH@MTLc3m.ttf"
+#define DEFAULT_MINCHO_TTF "@DEFAULT_FONT_PATH@mincho.otf"