diff --git a/installer/installbuilder/autoupdater.xml b/installer/installbuilder/autoupdater.xml
index 3e2dab990..a816fbf9c 100644
--- a/installer/installbuilder/autoupdater.xml
+++ b/installer/installbuilder/autoupdater.xml
@@ -1,12 +1,13 @@
 <component>
     <name>autoupdater</name>
-    <description>includes tool to perform updates</description>
+    <description>Auto Updater</description>
     <canBeEdited>0</canBeEdited>
+    <detailedDescription>includes tool to perform updates</detailedDescription>
     <selected>1</selected>
     <show>0</show>
     <folderList>
         <folder>
-            <description>Auto Updater</description>
+            <description>/</description>
             <destination>${installdir}</destination>
             <name>autoupdaterwin</name>
             <platforms>windows</platforms>
@@ -15,7 +16,7 @@
             </distributionFileList>
         </folder>
         <folder>
-            <description>Auto Updater</description>
+            <description>/</description>
             <destination>${installdir}</destination>
             <name>autoupdaterlinux</name>
             <platforms>linux linux-x64</platforms>
@@ -23,6 +24,17 @@
                 <distributionFile origin="../../dist/autoupdate-linux-x64.run"/>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>/</description>
+            <destination>${installdir}</destination>
+            <name>autoupdaterosx</name>
+            <platforms>osx</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/autoupdate-osx.app</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
     <postInstallationActionList>
         <writeFile>
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index f53767f10..ba920148c 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -72,6 +72,22 @@ check_for_updates = 1
             <program>${installdir}/bin/swiftlauncher</program>
             <programArguments></programArguments>
             <progressText>Run swift launcher</progressText>
+            <ruleList>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
+        <runProgram>
+            <program>${Installdir}/bin/swiftlauncher.app/Contents/MacOS/swiftlauncher</program>
+            <programArguments></programArguments>
+            <progressText>Run swift launcher</progressText>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
         </runProgram>
     </finalPageActionList>
     <licenseFileList>
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index be97063d7..5e1f87d76 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -123,5 +123,51 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>lib</description>
+            <destination>${installdir}/lib</destination>
+            <name>lib_osx</name>
+            <platforms>osx</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/lib/libdbus-1.3.dylib</origin>
+                </distributionFile>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtCore.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtDBus.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtGui.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtMultimedia.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtNetwork.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtSvg.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtWidgets.framework</origin>
+                </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtXml.framework</origin>
+                </distributionDirectory>
+            </distributionFileList>
+        </folder>
+        <folder>
+            <description>bin</description>
+            <destination>${installdir}/bin</destination>
+            <name>bin_osx</name>
+            <platforms>osx</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/bin/dbus-daemon</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
 </componentGroup>
diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index 7edde6973..9dd5aa5fa 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -47,5 +47,25 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>lib</description>
+            <destination>${installdir}/lib</destination>
+            <name>lib_osx</name>
+            <platforms>osx</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/lib/libopus.0.dylib</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libportaudio.2.dylib</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libspeexdsp.1.dylib</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libvatlib.dylib</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
     </folderList>
 </component>
diff --git a/installer/installbuilder/swift-pilotclient.xml b/installer/installbuilder/swift-pilotclient.xml
index 8b096c7fe..1728cb448 100644
--- a/installer/installbuilder/swift-pilotclient.xml
+++ b/installer/installbuilder/swift-pilotclient.xml
@@ -11,19 +11,23 @@ This installs the binaries to run all swift applications.</detailedDescription>
             <description>bin</description>
             <destination>${installdir}/bin</destination>
             <name>bin_linux</name>
-            <platforms>linux linux-x64</platforms>
+            <platforms>linux linux-x64 osx</platforms>
             <distributionFileList>
                 <distributionFile>
-                    <origin>../../dist/bin/swiftcore</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/swiftcore*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/swiftdata</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/swiftdata*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/swiftguistd</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/swiftguistd*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/swiftlauncher</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/swiftlauncher*</origin>
                 </distributionFile>
             </distributionFileList>
         </folder>
@@ -77,67 +81,27 @@ This installs the binaries to run all swift applications.</detailedDescription>
             <description>lib</description>
             <destination>${installdir}/lib</destination>
             <name>lib_linux</name>
-            <platforms>linux linux-x64</platforms>
+            <platforms>linux linux-x64 osx</platforms>
             <distributionFileList>
                 <distributionFile>
-                    <origin>../../dist/lib/libblackcore.so</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/lib/libblackcore*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libblackcore.so.0</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/lib/libblackgui*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libblackcore.so.0.7</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/lib/libblackinput*</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/lib/libblackcore.so.0.7.0</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/lib/libblackmisc*</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>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/lib/libblacksound*</origin>
                 </distributionFile>
             </distributionFileList>
         </folder>
diff --git a/installer/installbuilder/swift-plugin-simulators.xml b/installer/installbuilder/swift-plugin-simulators.xml
index 6f2677e5a..4a2c92b4a 100644
--- a/installer/installbuilder/swift-plugin-simulators.xml
+++ b/installer/installbuilder/swift-plugin-simulators.xml
@@ -1,6 +1,6 @@
 <componentGroup>
     <name>simulators</name>
-    <description>Simulators</description>
+    <description>Simulator Plugins</description>
     <canBeEdited>1</canBeEdited>
     <selected>1</selected>
     <show>1</show>
@@ -73,29 +73,12 @@ 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_win</name>
-                    <platforms>windows</platforms>
+                    <name>bin_plugins_simulator</name>
+                    <platforms>all</platforms>
                     <distributionFileList>
                         <distributionFile>
                             <allowWildcards>1</allowWildcards>
-                            <origin>../../dist/bin/plugins/simulator/simulatorxplane.dll</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../dist/bin/plugins/simulator/simulatorxplaneconfig.dll</origin>
-                        </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>
+                            <origin>../../dist/bin/plugins/simulator/*simulatorxplane*</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
diff --git a/installer/installbuilder/swift-samples.xml b/installer/installbuilder/swift-samples.xml
index 829fb28a1..5056c968f 100644
--- a/installer/installbuilder/swift-samples.xml
+++ b/installer/installbuilder/swift-samples.xml
@@ -6,23 +6,11 @@
     <selected>1</selected>
     <show>1</show>
     <folderList>
-        <folder>
-            <description>bin</description>
-            <destination>${installdir}/bin</destination>
-            <name>bin_windows</name>
-            <platforms>windows</platforms>
-            <distributionFileList>
-                <distributionFile>
-                    <allowWildcards>1</allowWildcards>
-                    <origin>../../dist/bin/sample*.exe</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <folder>
             <description>bin</description>
             <destination>${installdir}/bin</destination>
             <name>bin_linux</name>
-            <platforms>linux linux-x64</platforms>
+            <platforms>all</platforms>
             <distributionFileList>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>