diff --git a/installer/installbuilder/createbundledmg.xml b/installer/installbuilder/createbundledmg.xml
new file mode 100644
index 000000000..5532cf1f2
--- /dev/null
+++ b/installer/installbuilder/createbundledmg.xml
@@ -0,0 +1,132 @@
+<actionDefinition>
+    <name>createBundleDmg</name>
+    <actionList>
+        <createTimeStamp>
+            <format>%Y%m%d%H%M%S</format>
+            <variable>timestamp</variable>
+        </createTimeStamp>
+        <setInstallerVariable>
+            <name>tempDir</name>
+            <value>/tmp/.tmpDir${timestamp}</value>
+        </setInstallerVariable>
+        <setInstallerVariableFromRegEx>
+            <name>installerBasename</name>
+            <pattern>(swift-installer-osx-\d+-\d.\d.\d).app</pattern>
+            <substitution>\1</substitution>
+            <text>${project.installerFilename}</text>
+        </setInstallerVariableFromRegEx>
+        <setInstallerVariable>
+            <name>dmgName</name>
+            <value>${project.outputDirectory}/${installerBasename}.dmg</value>
+        </setInstallerVariable>
+        <setInstallerVariable>
+            <name>tempDmgFile</name>
+            <value>${tempDir}/tmp.dmg</value>
+        </setInstallerVariable>
+        <deleteFile>
+            <path>${project.outputDirectory}/${installerBasename}.dmg</path>
+        </deleteFile>
+        <deleteFile>
+            <path>${tempDir}</path>
+        </deleteFile>
+        <createDirectory>
+            <path>${tempDir}/output</path>
+        </createDirectory>
+        <createDirectory>
+            <path>${tempDir}/mnt</path>
+        </createDirectory>
+        <copyFile>
+            <destination>${tempDir}/output</destination>
+            <origin>${project.outputDirectory}/${project.installerFilename}</origin>
+        </copyFile>
+
+        <!-- Volume Icon -->
+        <actionGroup>
+            <actionList>
+                <createDirectory>
+                    <path>${tempDir}/output/.background</path>
+                </createDirectory>
+                <copyFile>
+                    <destination>${tempDir}/output/.background/background.png</destination>
+                    <origin>${build_project_directory}/../images/background.png</origin>
+                </copyFile>
+            </actionList>
+            <ruleList>
+                <fileExists path="${build_project_directory}/../images/background.png"/>
+            </ruleList>
+        </actionGroup>
+        <runProgram>
+            <program>hdiutil</program>
+            <programArguments>create -srcfolder "${tempDir}/output" -volname "${project.fullName}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "${tempDmgFile}"</programArguments>
+        </runProgram>
+        <actionGroup>
+            <actionList>
+                <runProgram>
+                    <abortOnError>0</abortOnError>
+                    <program>hdiutil</program>
+                    <programArguments>detach "/Volumes/${project.fullName}"</programArguments>
+                    <showMessageOnError>0</showMessageOnError>
+                </runProgram>
+                <runProgram>
+                    <program>hdiutil</program>
+                    <programArguments>attach -readwrite -noverify -noautoopen "${tempDmgFile}"</programArguments>
+                </runProgram>
+                <runProgram>
+                    <program>osascript</program>
+                    <programArguments>-e 'tell application "Finder"
+tell disk "${project.fullName}"
+open
+set current view of container window to icon view
+set toolbar visible of container window to false
+set statusbar visible of container window to false
+set the bounds of container window to {${dmgWindowBounds}}
+set theViewOptions to the icon view options of container window
+set arrangement of theViewOptions to not arranged
+set icon size of theViewOptions to ${dmgIconSize}
+delay 5
+update without registering applications
+set position of item "${project.installerFilename}" of container window to {${dmgIconPosition}}
+update without registering applications
+delay 5
+end tell
+end tell'
+          </programArguments>
+                </runProgram>
+                <runProgram>
+                    <program>hdiutil</program>
+                    <programArguments>detach "/Volumes/${project.fullName}"</programArguments>
+                </runProgram>
+            </actionList>
+        </actionGroup>
+        <runProgram>
+            <program>hdiutil</program>
+            <programArguments>convert "${tempDmgFile}" -format UDZO -imagekey zlib-level=9 -o "${dmgName}"</programArguments>
+        </runProgram>
+        <deleteFile>
+            <path>${tempDir}</path>
+        </deleteFile>
+    </actionList>
+    <parameterList>
+        <stringParameter name="dmgIconPosition" value="186, 186" ask="0">
+            <description></description>
+            <explanation></explanation>
+            <default></default>
+            <allowEmptyValue>1</allowEmptyValue>
+            <width>40</width>
+        </stringParameter>
+        <stringParameter name="dmgWindowBounds" value="400, 100, 765, 465" ask="0">
+            <description></description>
+            <explanation></explanation>
+            <default></default>
+            <allowEmptyValue>1</allowEmptyValue>
+            <width>40</width>
+        </stringParameter>
+        <stringParameter name="dmgIconSize" value="128" ask="0">
+            <description></description>
+            <explanation></explanation>
+            <default></default>
+            <allowEmptyValue>1</allowEmptyValue>
+            <width>40</width>
+        </stringParameter>
+    </parameterList>
+</actionDefinition>
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index 3b8f437bd..1e29c2cad 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -6,6 +6,11 @@
     <leftImage>../images/leftimage.png</leftImage>
     <logoImage>../images/logo.png</logoImage>
     <splashImage>../images/splashscreen.png</splashImage>
+    <functionDefinitionList>
+        <include>
+            <file>createbundledmg.xml</file>
+        </include>
+    </functionDefinitionList>
     <requireInstallationByRootUser>0</requireInstallationByRootUser>
     <componentList>
         <include>
@@ -21,6 +26,18 @@
             <file>vcredist.xml</file>
         </include>
     </componentList>
+    <postBuildActionList>
+        <createBundleDmg>
+            <dmgIconPosition>186, 186</dmgIconPosition>
+            <dmgIconSize>128</dmgIconSize>
+            <dmgWindowBounds>400, 100, 765, 465</dmgWindowBounds>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </createBundleDmg>
+    </postBuildActionList>
     <postInstallationActionList>
         <createDirectory>
             <path>/usr/local/var/lib/dbus</path>
@@ -108,7 +125,7 @@
     <compressionAlgorithm>lzma</compressionAlgorithm>
 
     <!-- Generate a DMG for OSX Installer -->
-    <createOsxBundleDmg>1</createOsxBundleDmg>
+    <createOsxBundleDmg>0</createOsxBundleDmg>
 
     <!--  <allowedLanguages>en fr es it de ja nl ru zh_CN no pt_BR</allowedLanguages> -->
     <enableRollback>0</enableRollback>