diff --git a/release/winx86/openpilotgcs.nsi b/release/winx86/openpilotgcs.nsi
index 93a61d785..0bf5eb52a 100644
--- a/release/winx86/openpilotgcs.nsi
+++ b/release/winx86/openpilotgcs.nsi
@@ -151,8 +151,6 @@ Section "Core files" InSecCore
   SectionIn RO
   SetOutPath "$INSTDIR\bin"
   File /r "${GCS_BUILD_TREE}\bin\*"
-  SetOutPath "$INSTDIR\share\${FIRMWARE_DIR}"
-  File /r "${RELEASE_DIR}\${FIRMWARE_DIR}\*"
 SectionEnd
 
 Section "Plugins" InSecPlugins
@@ -185,6 +183,11 @@ Section "Localization" InSecLocalization
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\*.qm"
 SectionEnd
 
+Section "Firmware" InSecFirmware
+  SetOutPath "$INSTDIR\firmware\${FIRMWARE_DIR}"
+  File /r "${RELEASE_DIR}\${FIRMWARE_DIR}\*"
+SectionEnd
+
 Section "Shortcuts" InSecShortcuts
   ; Create desktop and start menu shortcuts
   SetOutPath "$INSTDIR"
@@ -219,6 +222,7 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecResources} $(DESC_InSecResources)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecSounds} $(DESC_InSecSounds)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecLocalization} $(DESC_InSecLocalization)
+    !insertmacro MUI_DESCRIPTION_TEXT ${InSecFirmware} $(DESC_InSecFirmware)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecShortcuts} $(DESC_InSecShortcuts)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -239,6 +243,7 @@ Section "un.OpenPilot GCS" UnSecProgram
   RMDir /r /rebootok "$INSTDIR\bin"
   RMDir /r /rebootok "$INSTDIR\lib"
   RMDir /r /rebootok "$INSTDIR\share"
+  RMDir /r /rebootok "$INSTDIR\firmware"
   Delete /rebootok "$INSTDIR\Uninstall.exe"
 
   ; Remove directory
diff --git a/release/winx86/translations/strings_de.nsh b/release/winx86/translations/strings_de.nsh
index 8722192aa..8a0f3d6fa 100644
--- a/release/winx86/translations/strings_de.nsh
+++ b/release/winx86/translations/strings_de.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_GERMAN} "GCS Resourcen (Diagramme, Ziffernblätter, Kartensymbole, 3d-Modelle, PFD)."
   LangString DESC_InSecSounds ${LANG_GERMAN} "GCS Sounddateien (benötigt für akustische Ereignisbenachrichtigungen)."
   LangString DESC_InSecLocalization ${LANG_GERMAN} "GCS Lokalisierung (für unterstützte Sprachen)."
+  LangString DESC_InSecFirmware ${LANG_GERMAN} "OpenPilot firmware binaries."
   LangString DESC_InSecShortcuts ${LANG_GERMAN} "Installiere Verknüpfungen unter Startmenü->Anwendungen."
 
 ;--------------------------------
diff --git a/release/winx86/translations/strings_en.nsh b/release/winx86/translations/strings_en.nsh
index 224e018b7..3e0fbb401 100644
--- a/release/winx86/translations/strings_en.nsh
+++ b/release/winx86/translations/strings_en.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_ENGLISH} "GCS resources (diagrams, dials, mapicons, 3d-models, PFD)."
   LangString DESC_InSecSounds ${LANG_ENGLISH} "GCS sound files (used for audible event notifications)."
   LangString DESC_InSecLocalization ${LANG_ENGLISH} "GCS localization (for supported languages)."
+  LangString DESC_InSecFirmware ${LANG_ENGLISH} "OpenPilot firmware binaries."
   LangString DESC_InSecShortcuts ${LANG_ENGLISH} "Install application start menu shortcuts."
 
 ;--------------------------------
diff --git a/release/winx86/translations/strings_es.nsh b/release/winx86/translations/strings_es.nsh
index 12bc8c920..aa43b06bd 100644
--- a/release/winx86/translations/strings_es.nsh
+++ b/release/winx86/translations/strings_es.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_SPANISH} "Recursos del GCS (diagramas, marcadores, iconos del mapa, modelos, PFD)."
   LangString DESC_InSecSounds ${LANG_SPANISH} "Archivos de sonido del GCS (usados para los eventos y notificaciones audibles)."
   LangString DESC_InSecLocalization ${LANG_SPANISH} "Localización GCS (idiomas soportados)."
+  LangString DESC_InSecFirmware ${LANG_SPANISH} "OpenPilot firmware binaries."
   LangString DESC_InSecShortcuts ${LANG_SPANISH} "Instalar accesos directos de la aplicación (menú inicio y escritorio)."
 
 ;--------------------------------
diff --git a/release/winx86/translations/strings_fr.nsh b/release/winx86/translations/strings_fr.nsh
index 4c14b50aa..7c831590c 100644
--- a/release/winx86/translations/strings_fr.nsh
+++ b/release/winx86/translations/strings_fr.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_FRENCH} "Ressources GCS (diagrammes, cadrans, modèles 3d, PFD)."
   LangString DESC_InSecSounds ${LANG_FRENCH} "Fichiers son GCS (pour les notifications sonores)."
   LangString DESC_InSecLocalization ${LANG_FRENCH} "Fichiers de localisation (langues supportées)."
+  LangString DESC_InSecFirmware ${LANG_FRENCH} "OpenPilot firmware binaries."
   LangString DESC_InSecShortcuts ${LANG_FRENCH} "Installer les raccourcis dans le menu démarrer."
 
 ;--------------------------------
diff --git a/release/winx86/translations/strings_ru.nsh b/release/winx86/translations/strings_ru.nsh
index c6bc6e557..4b5a380dd 100644
--- a/release/winx86/translations/strings_ru.nsh
+++ b/release/winx86/translations/strings_ru.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_RUSSIAN} "Ресурсы GCS (диаграммы, приборы, пиктограммы, 3d-модели, PFD)."
   LangString DESC_InSecSounds ${LANG_RUSSIAN} "Звуковые файлы (используются для звуковых уведомлений о событиях)."
   LangString DESC_InSecLocalization ${LANG_RUSSIAN} "Файлы языковой поддержки (для поддерживаемых языков)."
+  LangString DESC_InSecFirmware ${LANG_RUSSIAN} "Файлы прошивок OpenPilot."
   LangString DESC_InSecShortcuts ${LANG_RUSSIAN} "Установка ярлыков для приложения."
 
 ;--------------------------------
diff --git a/release/winx86/translations/strings_zh_CN.nsh b/release/winx86/translations/strings_zh_CN.nsh
index 6cf4b9b12..5dad290a8 100644
--- a/release/winx86/translations/strings_zh_CN.nsh
+++ b/release/winx86/translations/strings_zh_CN.nsh
@@ -30,6 +30,7 @@
   LangString DESC_InSecResources ${LANG_TRADCHINESE} "地面站资源库（图表，地图，模型，PFD（主要飞行数据图））."
   LangString DESC_InSecSounds ${LANG_TRADCHINESE} "地面站音频文件（用于对于特定事件的提醒）."
   LangString DESC_InSecLocalization ${LANG_TRADCHINESE} "地面站本土化（适用于它所支持的语言）."
+  LangString DESC_InSecFirmware ${LANG_TRADCHINESE} "OpenPilot firmware binaries."
   LangString DESC_InSecShortcuts ${LANG_TRADCHINESE} "安装开始菜单的快捷方式."
 
 ;--------------------------------