diff --git a/ChangeLog.md b/ChangeLog.md
index 2142a1d..e000749 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -96,7 +96,6 @@
      * SuperMarioMaker
      * SuperMario
   * example: `nanodroid-font --set Splatoon2` and reboot
-     * currently this is not saved during updates
   * shell name: nanodroid-font
   * shell name: nfnt
 
diff --git a/CommonInstaller b/CommonInstaller
index 090ba74..a51ac34 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -242,6 +242,12 @@ detect_mode () {
 				error " !! failed to re-mount /system read-write"
 		unset MODPATH
 	fi
+
+	# backup fonts
+	if [[ "$(file ${MODPATH}/system/fonts/Roboto-Regular.ttf)" = *symbolic* ]]; then
+		ui_print " << backing up custom font"
+		CUSTOM_FONT="$(basename $(ls -l ${MODPATH}/system/fonts/Roboto-Regular.ttf | awk -F '->' '{print $2}') .ttf)"
+	fi
 }
 
 backup_nlpconflicts () {
@@ -455,8 +461,7 @@ magisk_install_setup () {
 magisk_install_preinst () {
 	if [ -f ${MODPATH}/system.prop ]; then
 		ui_print " << backing up module's system.prop"
-		cp ${MODPATH}/system.prop \
-			${TMPDIR}/system.prop
+		cp ${MODPATH}/system.prop ${TMPDIR}/system.prop
 	fi
 
 	if [ -f ${MODPATH}/system/framework/services.jar ]; then
@@ -534,6 +539,11 @@ magisk_install_finish () {
 		;;
 	esac
 
+	if [ ! -z ${CUSTOM_FONT} ]; then
+		ui_print " << Restoring custom font"
+		${MODPATH}/system/bin/nanodroid-font -s "${CUSTOM_FONT}"
+	fi
+
 	unmount_magisk_img
 	${BOOTMODE} || recovery_cleanup
 }
@@ -729,7 +739,7 @@ install_nanodroidscripts () {
 }
 
 install_fonts () {
-	if [ "${nanodroid_fonts}" -eq 1 -a "${MODE}" = "MAGISK" ]; then
+	if [ "${nanodroid_fonts}" -eq 1 ]; then
 		ui_print " << Nintendo Fonts"
 		nanodroid_install_file bin/nanodroid-font bin
 		nanodroid_substitute bin/nanodroid-font
diff --git a/doc/NanoDroidFont.md b/doc/NanoDroidFont.md
index 6b65707..f440e1d 100644
--- a/doc/NanoDroidFont.md
+++ b/doc/NanoDroidFont.md
@@ -4,8 +4,6 @@
 
 The `nanodroid-font` Script, respectively it's shortcut `nfnt` is used to change the System UI font (reboot required to take effect)
 
-The Font is not saved during NanoDroid Updates, thus needs to be re-applied after an update; restoration support during updates is a planned feature
-
 ## Invocation
 
 From within a terminal on your device, for example `adb shell` or `Termux` invoke the script using either