4 files changed, 22 insertions, 4 deletions
diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi
index 03b9e0ebb..a8d704962 100644
--- a/win/CS/Installer/Installer.nsi
+++ b/win/CS/Installer/Installer.nsi
@@ -140,7 +140,7 @@ Section "Handbrake" SEC01
   ; Copy the standard fonts config set into the fonts folder
   SetOutPath "$INSTDIR\fonts"
   SetOverwrite ifnewer
-  File "fonts\*.*"
+  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -173,7 +173,11 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
   RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"
diff --git a/win/CS/Installer/Installer64.nsi b/win/CS/Installer/Installer64.nsi
index 92a8ec69d..35e84caa1 100644
--- a/win/CS/Installer/Installer64.nsi
+++ b/win/CS/Installer/Installer64.nsi
@@ -141,7 +141,9 @@ Section "Handbrake" SEC01
   ; Copy the standard fonts config set into the fonts folder
   SetOutPath "$INSTDIR\fonts"
   SetOverwrite ifnewer
-  File "fonts\*.*"
+  File /r "fonts\*.*"
+
+  
 SectionEnd
 
 Section -AdditionalIcons
@@ -174,7 +176,11 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
   RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"
diff --git a/win/CS/Installer/MakeNightly.nsi.tmpl b/win/CS/Installer/MakeNightly.nsi.tmpl
index 18fe720e2..c168e139d 100644
--- a/win/CS/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly.nsi.tmpl
@@ -141,7 +141,7 @@ Section "Handbrake" SEC01
   ; Copy the standard fonts config set into the fonts folder
   SetOutPath "$INSTDIR\fonts"
   SetOverwrite ifnewer
-  File "fonts\*.*"
+  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -174,7 +174,11 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
   RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"
diff --git a/win/CS/Installer/MakeNightly64.nsi.tmpl b/win/CS/Installer/MakeNightly64.nsi.tmpl
index 4de8c78a3..056fd36f6 100644
--- a/win/CS/Installer/MakeNightly64.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly64.nsi.tmpl
@@ -140,7 +140,7 @@ Section "Handbrake" SEC01
   ; Copy the standard fonts config set into the fonts folder
   SetOutPath "$INSTDIR\fonts"
   SetOverwrite ifnewer
-  File "fonts\*.*"
+  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -173,7 +173,11 @@ Section Uninstall
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   Delete "$INSTDIR\fonts\*.*"
+  Delete "$INSTDIR\fonts\conf.d\*.*"
+  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
+  RMDIR  "$INSTDIR\fonts\conf.d"
+  RMDIR  "$INSTDIR\fonts\conf.avail"
   RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"