diff --git a/HISTORY.txt b/HISTORY.txt
index d0492dd1f..838f25d05 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,5 +1,13 @@
 Short summary of changes.  For a complete list see the git log.
 
+2012-07-20
+AeroSimRC simulator plugin is now included into the Windows distribution
+(will be installed into .../OpenPilot/misc/AeroSIM-RC directory).  Still
+being an experimental development tool, it could be used to play with
+HITL version 2.  Other platforms include udp_test utility which can be
+used to check the connectivity with AeroSimRC plugin running on Windows
+machine.
+
 2012-07-10
 On Windows the installation mode was changed from per-user to per-machine
 (for all users) installation.  It is recommended to completely uninstall
diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi
index 363760ec0..2a032870d 100644
--- a/package/winx86/openpilotgcs.nsi
+++ b/package/winx86/openpilotgcs.nsi
@@ -38,6 +38,7 @@
   !define NSIS_DATA_TREE "."
   !define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs"
   !define UAVO_SYNTH_TREE "..\..\build\uavobject-synthetics"
+  !define AEROSIMRC_TREE "..\..\build\ground\AeroSIM-RC"
 
   ; Default installation folder
   InstallDir "$PROGRAMFILES\OpenPilot"
@@ -161,7 +162,7 @@ Section "Core files" InSecCore
 SectionEnd
 
 ; Copy GCS plugins
-Section "Plugins" InSecPlugins
+Section "-Plugins" InSecPlugins
   SectionIn RO
   SetOutPath "$INSTDIR\lib\openpilotgcs\plugins"
   File /r "${GCS_BUILD_TREE}\lib\openpilotgcs\plugins\*.dll"
@@ -169,7 +170,7 @@ Section "Plugins" InSecPlugins
 SectionEnd
 
 ; Copy GCS resources
-Section "Resources" InSecResources
+Section "-Resources" InSecResources
   SetOutPath "$INSTDIR\share\openpilotgcs\diagrams"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\diagrams\*"
   SetOutPath "$INSTDIR\share\openpilotgcs\dials"
@@ -183,14 +184,14 @@ Section "Resources" InSecResources
 SectionEnd
 
 ; Copy Notify plugin sound files
-Section "Sound files" InSecSounds
+Section "-Sound files" InSecSounds
   SetOutPath "$INSTDIR\share\openpilotgcs\sounds"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\sounds\*"
 SectionEnd
 
 ; Copy localization files
 ; Disabled until GCS source is stable and properly localized
-Section "Localization" InSecLocalization
+Section "-Localization" InSecLocalization
   SetOutPath "$INSTDIR\share\openpilotgcs\translations"
 ; File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\openpilotgcs_*.qm"
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\qt_*.qm"
@@ -229,6 +230,12 @@ Section "CDC driver" InSecInstallDrivers
   ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"'
 SectionEnd
 
+; AeroSimRC plugin files
+Section "AeroSimRC plugin" InSecAeroSimRC
+  SetOutPath "$INSTDIR\misc\AeroSIM-RC"
+  File /r "${AEROSIMRC_TREE}\*"
+SectionEnd
+
 Section "Shortcuts" InSecShortcuts
   ; Create desktop and start menu shortcuts
   SetOutPath "$INSTDIR"
@@ -277,6 +284,7 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecUtilities} $(DESC_InSecUtilities)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecDrivers} $(DESC_InSecDrivers)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecInstallDrivers} $(DESC_InSecInstallDrivers)
+    !insertmacro MUI_DESCRIPTION_TEXT ${InSecAeroSimRC} $(DESC_InSecAeroSimRC)
     !insertmacro MUI_DESCRIPTION_TEXT ${InSecShortcuts} $(DESC_InSecShortcuts)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -301,6 +309,7 @@ Section "un.OpenPilot GCS" UnSecProgram
   RMDir /r /rebootok "$INSTDIR\firmware"
   RMDir /r /rebootok "$INSTDIR\utilities"
   RMDir /r /rebootok "$INSTDIR\drivers"
+  RMDir /r /rebootok "$INSTDIR\misc"
   Delete /rebootok "$INSTDIR\HISTORY.txt"
   Delete /rebootok "$INSTDIR\Uninstall.exe"
 
diff --git a/package/winx86/translations/strings_de.nsh b/package/winx86/translations/strings_de.nsh
index 234a1fe3a..71ee8c489 100644
--- a/package/winx86/translations/strings_de.nsh
+++ b/package/winx86/translations/strings_de.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_GERMAN} "OpenPilot firmware binaries."
   LangString DESC_InSecUtilities ${LANG_GERMAN} "OpenPilot Dienstprogramme (Matlab Log Parser)."
   LangString DESC_InSecDrivers ${LANG_GERMAN} "OpenPilot Hardware Treiberdateien (optionaler OpenPilot CDC Treiber)."
-  LangString DESC_InSecInstallDrivers ${LANG_GERMAN} "Installiere OpenPilot CDC Treiber (optional)."
+  LangString DESC_InSecInstallDrivers ${LANG_GERMAN} "OpenPilot CDC Treiber (optional)."
+  LangString DESC_InSecAeroSimRC ${LANG_GERMAN} "AeroSimRC plugin files with sample configuration."
   LangString DESC_InSecShortcuts ${LANG_GERMAN} "Installiere Verknüpfungen unter Startmenü->Anwendungen."
 
 ;--------------------------------
diff --git a/package/winx86/translations/strings_en.nsh b/package/winx86/translations/strings_en.nsh
index 3e640ad4d..e8aa794b0 100644
--- a/package/winx86/translations/strings_en.nsh
+++ b/package/winx86/translations/strings_en.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_ENGLISH} "OpenPilot firmware binaries."
   LangString DESC_InSecUtilities ${LANG_ENGLISH} "OpenPilot utilities (Matlab log parser)."
   LangString DESC_InSecDrivers ${LANG_ENGLISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
-  LangString DESC_InSecInstallDrivers ${LANG_ENGLISH} "Install OpenPilot CDC driver (optional)."
+  LangString DESC_InSecInstallDrivers ${LANG_ENGLISH} "Optional OpenPilot CDC driver (virtual USB COM port)."
+  LangString DESC_InSecAeroSimRC ${LANG_ENGLISH} "AeroSimRC plugin files with sample configuration."
   LangString DESC_InSecShortcuts ${LANG_ENGLISH} "Install application start menu shortcuts."
 
 ;--------------------------------
diff --git a/package/winx86/translations/strings_es.nsh b/package/winx86/translations/strings_es.nsh
index 21aeb31d4..6ac59f0d8 100644
--- a/package/winx86/translations/strings_es.nsh
+++ b/package/winx86/translations/strings_es.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_SPANISH} "OpenPilot firmware binaries."
   LangString DESC_InSecUtilities ${LANG_SPANISH} "OpenPilot utilities (Matlab log parser)."
   LangString DESC_InSecDrivers ${LANG_SPANISH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
-  LangString DESC_InSecInstallDrivers ${LANG_SPANISH} "Install OpenPilot CDC driver (optional)."
+  LangString DESC_InSecInstallDrivers ${LANG_SPANISH} "Optional OpenPilot CDC driver (virtual USB COM port)."
+  LangString DESC_InSecAeroSimRC ${LANG_SPANISH} "AeroSimRC plugin files with sample configuration."
   LangString DESC_InSecShortcuts ${LANG_SPANISH} "Instalar accesos directos de la aplicación (menú inicio y escritorio)."
 
 ;--------------------------------
diff --git a/package/winx86/translations/strings_fr.nsh b/package/winx86/translations/strings_fr.nsh
index 3b1c9efb0..c0919405e 100644
--- a/package/winx86/translations/strings_fr.nsh
+++ b/package/winx86/translations/strings_fr.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_FRENCH} "OpenPilot firmware binaries."
   LangString DESC_InSecUtilities ${LANG_FRENCH} "OpenPilot utilities (Matlab log parser)."
   LangString DESC_InSecDrivers ${LANG_FRENCH} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
-  LangString DESC_InSecInstallDrivers ${LANG_FRENCH} "Install OpenPilot CDC driver (optional)."
+  LangString DESC_InSecInstallDrivers ${LANG_FRENCH} "Optional OpenPilot CDC driver (virtual USB COM port)."
+  LangString DESC_InSecAeroSimRC ${LANG_FRENCH} "AeroSimRC plugin files with sample configuration."
   LangString DESC_InSecShortcuts ${LANG_FRENCH} "Installer les raccourcis dans le menu démarrer."
 
 ;--------------------------------
diff --git a/package/winx86/translations/strings_ru.nsh b/package/winx86/translations/strings_ru.nsh
index f62e708d2..0aa90b31a 100644
--- a/package/winx86/translations/strings_ru.nsh
+++ b/package/winx86/translations/strings_ru.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_RUSSIAN} "Файлы прошивок OpenPilot."
   LangString DESC_InSecUtilities ${LANG_RUSSIAN} "Утилиты (конвертор логов для Matlab)."
   LangString DESC_InSecDrivers ${LANG_RUSSIAN} "Файлы драйверов (опциональный драйвер CDC порта)."
-  LangString DESC_InSecInstallDrivers ${LANG_RUSSIAN} "Установка опционального OpenPilot CDC драйвера."
+  LangString DESC_InSecInstallDrivers ${LANG_RUSSIAN} "Опциональный OpenPilot CDC драйвер (виртуальный USB COM порт)."
+  LangString DESC_InSecAeroSimRC ${LANG_RUSSIAN} "Файлы плагина для симулятора AeroSimRC с примером конфигурации."
   LangString DESC_InSecShortcuts ${LANG_RUSSIAN} "Установка ярлыков для приложения."
 
 ;--------------------------------
diff --git a/package/winx86/translations/strings_zh_CN.nsh b/package/winx86/translations/strings_zh_CN.nsh
index 5eff43762..50d867223 100644
--- a/package/winx86/translations/strings_zh_CN.nsh
+++ b/package/winx86/translations/strings_zh_CN.nsh
@@ -33,7 +33,8 @@
   LangString DESC_InSecFirmware ${LANG_TRADCHINESE} "OpenPilot firmware binaries."
   LangString DESC_InSecUtilities ${LANG_TRADCHINESE} "OpenPilot utilities (Matlab log parser)."
   LangString DESC_InSecDrivers ${LANG_TRADCHINESE} "OpenPilot hardware driver files (optional OpenPilot CDC driver)."
-  LangString DESC_InSecInstallDrivers ${LANG_TRADCHINESE} "Install OpenPilot CDC driver (optional)."
+  LangString DESC_InSecInstallDrivers ${LANG_TRADCHINESE} "Optional OpenPilot CDC driver (virtual USB COM port)."
+  LangString DESC_InSecAeroSimRC ${LANG_TRADCHINESE} "AeroSimRC plugin files with sample configuration."
   LangString DESC_InSecShortcuts ${LANG_TRADCHINESE} "安装开始菜单的快捷方式."
 
 ;--------------------------------