diff --git a/install.pri b/install.pri
index fafe1ab5f..da3dc9408 100644
--- a/install.pri
+++ b/install.pri
@@ -183,11 +183,11 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
 
     create_updater.depends = copy_installer_project
     win32: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} windows
-    unix:!macx: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} linux
+    unix:!macx: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} linux-x64
     QMAKE_EXTRA_TARGETS += create_updater
 
     create_installer.depends = create_updater
     win32: create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows --setvars project.outputDirectory=$$shell_path($${PREFIX}/..)
-    unix:!macx: create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} linux --setvars project.outputDirectory=$$shell_path($${PREFIX}/..)
+    unix:!macx: create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} linux-x64 --setvars project.outputDirectory=$$shell_path($${PREFIX}/..)
     QMAKE_EXTRA_TARGETS += create_installer
 }
diff --git a/installer/installbuilder/autoupdater.xml b/installer/installbuilder/autoupdater.xml
index a6742ef4f..3e2dab990 100644
--- a/installer/installbuilder/autoupdater.xml
+++ b/installer/installbuilder/autoupdater.xml
@@ -18,9 +18,9 @@
             <description>Auto Updater</description>
             <destination>${installdir}</destination>
             <name>autoupdaterlinux</name>
-            <platforms>linux</platforms>
+            <platforms>linux linux-x64</platforms>
             <distributionFileList>
-                <distributionFile origin="../../dist/autoupdate-linux.run"/>
+                <distributionFile origin="../../dist/autoupdate-linux-x64.run"/>
             </distributionFileList>
         </folder>
     </folderList>
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index 50892d5f0..f53767f10 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>swift</shortName>
     <fullName>swift</fullName>
-    <version>0.6.1</version>
+    <version>0.7.0</version>
     <readmeFile>../../dist/bin/README.md</readmeFile>
     <licenseFile>../../dist/bin/LICENSE</licenseFile>
     <leftImage>../images/leftimage.png</leftImage>
@@ -66,10 +66,10 @@ check_for_updates = 1
             <encoding>utf-8</encoding>
             <file>${build_project_directory}/lang/alf-en.po</file>
         </language> -->
-    </customLanguageFileList>
+</customLanguageFileList>
     <finalPageActionList>
         <runProgram>
-            <program>${installdir}/bin/swiftlauncher.exe</program>
+            <program>${installdir}/bin/swiftlauncher</program>
             <programArguments></programArguments>
             <progressText>Run swift launcher</progressText>
         </runProgram>
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 7710b8ec3..be97063d7 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -67,15 +67,61 @@
             </distributionFileList>
         </folder>
         <folder>
-            <description>/</description>
+            <description>share</description>
             <destination>${installdir}/</destination>
-            <name>root</name>
-            <platforms>all</platforms>
+            <name>share</name>
+            <platforms>windows</platforms>
             <distributionFileList>
                 <distributionDirectory>
                     <origin>../../dist/share</origin>
                 </distributionDirectory>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>lib</description>
+            <destination>${installdir}/lib</destination>
+            <name>lib_linux</name>
+            <platforms>linux linux-x64</platforms>
+            <distributionFileList>
+            <!-- Disable icu until Jenkins Qt5 is linked against it.
+                <distributionFile>
+                    <origin>../../dist/lib/libicudata.so.56</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libicui18n.so.56</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libicuuc.so.56</origin>
+                </distributionFile>
+				-->
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Core.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5DBus.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Gui.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Multimedia.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Network.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Svg.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Widgets.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5XcbQpa.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Xml.so.5</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
 </componentGroup>
diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index cb1b795f8..6a3d8c416 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -39,5 +39,16 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>lib</description>
+            <destination>${installdir}/lib</destination>
+            <name>lib_linux</name>
+            <platforms>linux linux-x64</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/lib/libvatlib.so</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
 </component>
diff --git a/installer/installbuilder/swift-pilotclient.xml b/installer/installbuilder/swift-pilotclient.xml
index d33e258ea..8b096c7fe 100644
--- a/installer/installbuilder/swift-pilotclient.xml
+++ b/installer/installbuilder/swift-pilotclient.xml
@@ -11,7 +11,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
             <description>bin</description>
             <destination>${installdir}/bin</destination>
             <name>bin_linux</name>
-            <platforms>linux</platforms>
+            <platforms>linux linux-x64</platforms>
             <distributionFileList>
                 <distributionFile>
                     <origin>../../dist/bin/swiftcore</origin>
@@ -63,24 +63,89 @@ This installs the binaries to run all swift applications.</detailedDescription>
             </distributionFileList>
         </folder>
         <folder>
-            <description>/</description>
+            <description>data</description>
             <destination>${installdir}/</destination>
-            <name>root</name>
+            <name>data</name>
             <platforms>all</platforms>
             <distributionFileList>
                 <distributionDirectory>
                     <origin>../../dist/data</origin>
                 </distributionDirectory>
-                <distributionDirectory>
-                    <origin>../../dist/share</origin>
-                </distributionDirectory>
+            </distributionFileList>
+        </folder>
+        <folder>
+            <description>lib</description>
+            <destination>${installdir}/lib</destination>
+            <name>lib_linux</name>
+            <platforms>linux linux-x64</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackcore.so</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackcore.so.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackcore.so.0.7</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackcore.so.0.7.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackgui.so</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackgui.so.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackgui.so.0.7</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackgui.so.0.7.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackinput.so</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackinput.so.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackinput.so.0.7</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackinput.so.0.7.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackmisc.so</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackmisc.so.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackmisc.so.0.7</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblackmisc.so.0.7.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblacksound.so</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblacksound.so.0</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblacksound.so.0.7</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libblacksound.so.0.7.0</origin>
+                </distributionFile>
             </distributionFileList>
         </folder>
     </folderList>
     <startMenuShortcutList>
         <startMenuShortcut>
             <comment></comment>
-            <name>swiftgui</name>
+            <name>swift gui</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftguistd.exe</windowsExec>
@@ -90,7 +155,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swiftcore</name>
+            <name>swift core</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftcore.exe</windowsExec>
@@ -100,7 +165,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swiftdata</name>
+            <name>swift data</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftdata.exe</windowsExec>
diff --git a/installer/installbuilder/swift-plugin-simulators.xml b/installer/installbuilder/swift-plugin-simulators.xml
index 818ddbd07..6f2677e5a 100644
--- a/installer/installbuilder/swift-plugin-simulators.xml
+++ b/installer/installbuilder/swift-plugin-simulators.xml
@@ -25,6 +25,11 @@
                     </distributionFileList>
                 </folder>
             </folderList>
+            <shouldPackRuleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </shouldPackRuleList>
         </component>
         <component>
             <name>fsx</name>
@@ -50,6 +55,11 @@ This plugin acts as the interface between swift and FSX.</detailedDescription>
                     </distributionFileList>
                 </folder>
             </folderList>
+            <shouldPackRuleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </shouldPackRuleList>
         </component>
         <component>
             <name>xplane</name>
@@ -63,10 +73,11 @@ This plugin acts as the interface between swift and X-Plane</detailedDescription
                 <folder>
                     <description>bin/plugins/simulator</description>
                     <destination>${installdir}/bin/plugins/simulator</destination>
-                    <name>bin_plugins_simulator</name>
-                    <platforms>all</platforms>
+                    <name>bin_plugins_simulator_win</name>
+                    <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionFile>
+                            <allowWildcards>1</allowWildcards>
                             <origin>../../dist/bin/plugins/simulator/simulatorxplane.dll</origin>
                         </distributionFile>
                         <distributionFile>
@@ -74,6 +85,20 @@ This plugin acts as the interface between swift and X-Plane</detailedDescription
                         </distributionFile>
                     </distributionFileList>
                 </folder>
+                <folder>
+                    <description>bin/plugins/simulator</description>
+                    <destination>${installdir}/bin/plugins/simulator</destination>
+                    <name>bin_plugins_simulator_linux</name>
+                    <platforms>linux linux-x64</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../dist/bin/plugins/simulator/libsimulatorxplane.so</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../dist/bin/plugins/simulator/libsimulatorxplaneconfig.so</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
             </folderList>
         </component>
     </componentList>
diff --git a/installer/installbuilder/swift-samples.xml b/installer/installbuilder/swift-samples.xml
index 0dcaa43d1..829fb28a1 100644
--- a/installer/installbuilder/swift-samples.xml
+++ b/installer/installbuilder/swift-samples.xml
@@ -18,5 +18,17 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>bin</description>
+            <destination>${installdir}/bin</destination>
+            <name>bin_linux</name>
+            <platforms>linux linux-x64</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/sample*</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
 </component>
diff --git a/installer/installbuilder/vcredist.xml b/installer/installbuilder/vcredist.xml
index 56b488d67..d3f26ef99 100644
--- a/installer/installbuilder/vcredist.xml
+++ b/installer/installbuilder/vcredist.xml
@@ -54,4 +54,9 @@
             </distributionFileList>
         </folder>
     </folderList>
+    <shouldPackRuleList>
+        <platformTest>
+            <type>windows</type>
+        </platformTest>
+    </shouldPackRuleList>
 </component>