diff --git a/resources/install/build.xml b/resources/install/build.xml
index f684a23cc..0db0fd3d7 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -499,14 +499,35 @@
     <target name="dmg" depends="macosx-sparkle"
             if="is.running.macos"
             description="Create a .dmg package for MACOSX (only works on MACOSX)">
-                
+
       <propertyfile file="${macosx.app.dir}/versionupdate.properties" 
             comment="Last Build Version">
             <entry  key="last_version" value="${sip-communicator.version}"/>
             <entry  key="download_link" 
                     value="http://download.sip-communicator.org/nightly/macosx/${package.name}-${sip-communicator.version}.dmg"/>
       </propertyfile>
-                
+
+      <!-- Copy the urlhandler application to destination dir-->
+      <copy todir="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app">
+        <fileset dir="${macosx.resrc.dir}/URLHandler.app"/>
+      </copy>
+      <!-- copy and icon as it uses our application icon -->
+      <copy todir="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app/Contents/Resources">
+        <fileset file="resources/images/logo/sc_logo_128x128.icns"/>
+      </copy>
+      <!-- move our application plist template -->
+      <move file="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app/Contents/Info.plist.tmpl"
+              tofile="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app/Contents/Info.plist"/>
+      <!-- change name of the urlhandler application-->
+      <replace
+        file="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app/Contents/Info.plist"
+        value="${application.name}">
+            <replacefilter
+                token="APP_NAME"/>
+      </replace>
+      <!-- make sure that launcher is executable -->
+      <chmod file="${macosx.app.dir}/${application.name}.app/Contents/Resources/URLHandler.app/Contents/MacOS/URLHandler" perm="+x"/>
+
       <property name="macosx.dmg.name"
                 value="${package.name}-${sip-communicator.version}.dmg"/>
       <property name="macosx.dmg.tmpname"
diff --git a/resources/install/macosx/URLHandler.app/Contents/Info.plist.tmpl b/resources/install/macosx/URLHandler.app/Contents/Info.plist.tmpl
new file mode 100644
index 000000000..dee18bb3a
--- /dev/null
+++ b/resources/install/macosx/URLHandler.app/Contents/Info.plist.tmpl
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>URLHandler</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.myCocoaApp</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>APP_NAME</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>sipu</string>
+	<key>CFBundleIconFile</key>
+	<string>sc_logo_128x128.icns</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>sip</string>
+				<string>feed</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>0.2</string>
+	<key>NSAppleScriptEnabled</key>
+	<string>YES</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/resources/install/macosx/URLHandler.app/Contents/MacOS/URLHandler b/resources/install/macosx/URLHandler.app/Contents/MacOS/URLHandler
new file mode 100755
index 000000000..78b27f136
Binary files /dev/null and b/resources/install/macosx/URLHandler.app/Contents/MacOS/URLHandler differ
diff --git a/resources/install/macosx/URLHandler.app/Contents/PkgInfo b/resources/install/macosx/URLHandler.app/Contents/PkgInfo
new file mode 100644
index 000000000..9745d580a
--- /dev/null
+++ b/resources/install/macosx/URLHandler.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPLsipu
\ No newline at end of file