diff --git a/installer/installbuilder/autoupdateproject.xml b/installer/installbuilder/autoupdateproject.xml
new file mode 100644
index 000000000..8a940fd6b
--- /dev/null
+++ b/installer/installbuilder/autoupdateproject.xml
@@ -0,0 +1,9 @@
+
+ swift
+ swift
+ swift project
+ 0.6.1
+ 1
+ 1
+ ../../dist
+
\ No newline at end of file
diff --git a/installer/installbuilder/autoupdater.xml b/installer/installbuilder/autoupdater.xml
new file mode 100644
index 000000000..b2b501e0c
--- /dev/null
+++ b/installer/installbuilder/autoupdater.xml
@@ -0,0 +1,36 @@
+
+ autoupdater
+ includes tool to perform updates
+ 0
+ 1
+ 0
+
+
+ ${installdir}
+ autoupdaterwin
+ windows
+
+
+
+
+
+ ${installdir}
+ autoupdaterlinux
+ linux
+
+
+
+
+
+
+
+ ${installdir}/update.ini
+ [Update]
+url = http://127.0.0.1:8080/update.xml
+version_id = 061
+update_download_location = ${system_temp_directory}
+check_for_updates = 1
+
+
+
+
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
new file mode 100644
index 000000000..3f1759d70
--- /dev/null
+++ b/installer/installbuilder/project.xml
@@ -0,0 +1,117 @@
+
+ swift
+ swift
+ 0.6.1
+ ../../dist/bin/README.md
+ ../../dist/bin/LICENSE
+ ../images/leftimage.png
+ ../images/logo.png
+ ../images/splashscreen.png
+ .
+
+
+ swift.xml
+
+
+ qt5-binaries.xml
+
+
+ autoupdater.xml
+
+
+ vcredist.xml
+
+
+
+
+ ${installdir}/update.ini
+ [Update]
+url = http://127.0.0.1:8080/update.xml
+version_id = 061
+update_download_location = ${system_temp_directory}
+check_for_updates = 1
+
+
+
+
+
+ ${installdir}/update.ini
+
+
+ 1
+ lzma
+
+
+ 1
+
+
+ 0
+ 1
+
+
+ org.swift-project.macinstaller
+ ../images/icon.ico
+ 1
+ swift Project
+ ../images/icon.ico
+
+
+ http://timestamp.digicert.com
+
+
+
+
+
+ ${installdir}/bin/swiftguistd.exe
+
+ Run swift launcher
+
+
+
+
+ en
+ utf-8
+ ../../dist/bin/LICENSE
+
+
+
+
+ installdir
+ Installer.Parameter.installdir.description
+ Installer.Parameter.installdir.explanation
+
+ ${platform_install_prefix}/${product_shortname}-${product_version}
+ 0
+ prefix
+ 1
+ 0
+ 30
+
+
+
+
+ 430
+ osx
+
+
+ 430
+ linux
+
+
+ 430
+ linux-x64
+
+
+ 430
+ linux-ia64
+
+
+
+
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
new file mode 100644
index 000000000..1e917fc46
--- /dev/null
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -0,0 +1,86 @@
+
+ qt5binaries
+ Qt5 binaries
+ 1
+ Qt 5.5 runtime binaries
+ 1
+ 1
+
+
+ bin
+ ${installdir}/bin
+ bin_windows
+ windows
+
+
+ ../../dist/bin/icuuc54.dll
+
+
+ 1
+ ../../dist/bin/Qt5Core*.dll
+
+
+ 1
+ ../../dist/bin/Qt5DBus*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Gui*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Network*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Svg*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Widgets*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Xml*.dll
+
+
+ 1
+ ../../dist/bin/Qt5Multimedia*.dll
+
+
+ 1
+ ../../dist/bin/dbus-1-3.dll
+
+
+ ../../dist/bin/dbus-daemon.exe
+
+
+ ../../dist/bin/icudt54.dll
+
+
+ ../../dist/bin/icuin54.dll
+
+
+ ../../dist/bin/icuuc54.dll
+
+
+ ../../dist/bin/platforms
+
+
+ ../../dist/bin/expat.dll
+
+
+
+
+ /
+ ${installdir}/
+ root
+ all
+
+
+ ../../dist/share
+
+
+
+
+
diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
new file mode 100644
index 000000000..2fd2adb92
--- /dev/null
+++ b/installer/installbuilder/swift-externals.xml
@@ -0,0 +1,38 @@
+
+ externals
+ Externals
+ 1
+ External libraries:
+- vatlib
+- speex
+- speexdsp
+- opus
+- portaudio
+ 1
+ 1
+
+
+ bin
+ ${installdir}/bin
+ bin_windows
+ windows
+
+
+ ../../dist/bin/vatlib2.dll
+
+
+ ../../dist/bin/portaudio.dll
+
+
+ ../../dist/bin/SimConnect.dll
+
+
+ ../../dist/bin/speex.dll
+
+
+ ../../dist/bin/speexdsp.dll
+
+
+
+
+
diff --git a/installer/installbuilder/swift-pilotclient.xml b/installer/installbuilder/swift-pilotclient.xml
new file mode 100644
index 000000000..22ca7240c
--- /dev/null
+++ b/installer/installbuilder/swift-pilotclient.xml
@@ -0,0 +1,128 @@
+
+ pilotclient
+ Pilot Client
+ 1
+ swift pilot client binaries.
+This installs the binaries to run all swift applications.
+ 1
+ 1
+
+
+ bin
+ ${installdir}/bin
+ bin_linux
+ linux
+
+
+ ../../dist/bin/swiftcore
+
+
+ ../../dist/bin/swiftdata
+
+
+ ../../dist/bin/swiftguistd
+
+
+
+
+ bin
+ ${installdir}/bin
+ bin_windows
+ windows
+
+
+ ../../dist/bin/swiftcore.exe
+
+
+ ../../dist/bin/swiftdata.exe
+
+
+ ../../dist/bin/swiftguistd.exe
+
+
+ ../../dist/bin/blacksound.dll
+
+
+ ../../dist/bin/blackcore.dll
+
+
+ ../../dist/bin/blackgui.dll
+
+
+ ../../dist/bin/blackinput.dll
+
+
+ ../../dist/bin/blackmisc.dll
+
+
+
+
+ /
+ ${installdir}/
+ root
+ all
+
+
+ ../../dist/bootstrap
+
+
+ ../../dist/data
+
+
+ ../../dist/local.env.template
+
+
+ ../../dist/qss
+
+
+ ../../dist/sounds
+
+
+ ../../dist/swiftDB
+
+
+
+
+
+
+
+ swift gui
+ 0
+ 0
+ ${installdir}/bin/swiftguistd.exe
+
+
+
+
+
+
+ swift core
+ 0
+ 0
+ ${installdir}/bin/swiftcore.exe
+
+
+
+
+
+
+ swift data
+ 0
+ 0
+ ${installdir}/bin/swiftdata.exe
+
+
+
+
+
+
+ Uninstall swift
+ 0
+ 0
+ ${installdir}/uninstall.exe
+
+
+
+
+
+
diff --git a/installer/installbuilder/swift-plugin-simulators.xml b/installer/installbuilder/swift-plugin-simulators.xml
new file mode 100644
index 000000000..7ab915b43
--- /dev/null
+++ b/installer/installbuilder/swift-plugin-simulators.xml
@@ -0,0 +1,74 @@
+
+ simulators
+ Simulators
+ 1
+ 1
+ 1
+
+
+ fs2004
+ MS Flight Simulator 2004
+ 1
+ MS Flight Simulator 2004 Simulator Plugin
+ 1
+ 1
+
+
+ bin/plugins/simulator
+ ${installdir}/bin/plugins/simulator
+ bin_plugins_simulator
+ windows
+
+
+ ../../dist/bin/plugins/simulator/simulator_fs9.dll
+
+
+
+
+
+
+ fsx
+ MS Flight Simulator X
+ 1
+ MS Flight Simulator X Simulator Plugin
+This plugin acts as the interface between swift and FSX.
+ 1
+ 1
+
+
+ bin/plugins/simulator
+ ${installdir}/bin/plugins/simulator
+ bin_plugins_simulator
+ windows
+
+
+ ../../dist/bin/plugins/simulator/simulator_fsx.dll
+
+
+
+
+
+
+ xplane
+ X-Plane
+ 1
+ X-Plane Simulator Plugin
+This plugin acts as the interface between swift and X-Plane
+ 1
+ 1
+
+
+ bin/plugins/simulator
+ ${installdir}/bin/plugins/simulator
+ bin_plugins_simulator
+ all
+
+
+ ../../dist/bin/plugins/simulator/simulator_xplane.dll
+
+
+
+
+
+
+
diff --git a/installer/installbuilder/swift-samples.xml b/installer/installbuilder/swift-samples.xml
new file mode 100644
index 000000000..e0a868b31
--- /dev/null
+++ b/installer/installbuilder/swift-samples.xml
@@ -0,0 +1,22 @@
+
+ samples
+ Samples
+ 1
+ swift sample binaries
+ 1
+ 1
+
+
+ bin
+ ${installdir}/bin
+ bin_windows
+ windows
+
+
+ 1
+ ../../dist/bin/sample_*.exe
+
+
+
+
+
diff --git a/installer/installbuilder/swift.xml b/installer/installbuilder/swift.xml
new file mode 100644
index 000000000..97abab25a
--- /dev/null
+++ b/installer/installbuilder/swift.xml
@@ -0,0 +1,21 @@
+
+ swift
+ swift
+ 1
+ 1
+ 1
+
+
+ swift-pilotclient.xml
+
+
+ swift-plugin-simulators.xml
+
+
+ swift-externals.xml
+
+
+ swift-samples.xml
+
+
+
diff --git a/installer/installbuilder/vcredist.xml b/installer/installbuilder/vcredist.xml
new file mode 100644
index 000000000..fc315c9b8
--- /dev/null
+++ b/installer/installbuilder/vcredist.xml
@@ -0,0 +1,57 @@
+
+ vcruntime
+ Visual Studio 2013 Redistributables
+ 0
+ 1
+ 1
+
+
+ bin
+ ${installdir}/vcredist
+ share_windows
+ windows
+
+
+ ${installdir}/vcredist_x86.exe
+ /install /quiet /norestart
+ Installing VC++ 2013 runtime
+
+
+ HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86
+ exists
+ Installed
+ REG_DWORD
+ 32
+
+
+ ${installdir}/vcredist_x86.exe
+
+
+
+
+ ${installdir}/vcredist_x64.exe
+ /install /quiet /norestart
+ Installing VC++ 2013 runtime
+
+
+ HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x64
+ exists
+ Installed
+ REG_DWORD
+ 64
+
+
+ ${installdir}/vcredist_x64.exe
+
+
+
+
+
+
+ 1
+ ../../dist/vcredist/vcredist_*.exe
+
+
+
+
+