diff --git a/dist/macos/bundle/Info.plist.in b/dist/macos/bundle/Info.plist.in
new file mode 100644
index 00000000..e681046f
--- /dev/null
+++ b/dist/macos/bundle/Info.plist.in
@@ -0,0 +1,32 @@
+<!DOCTYPE plist PUBLIC "-//Apple Computer//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>CFBundleDisplayName</key>
+    <string>Synergy</string>
+    <key>CFBundleExecutable</key>
+    <string>synergy</string>
+    <key>CFBundleIconFile</key>
+    <string>Synergy.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>synergy</string>
+    <!-- TODO: Fix this in v2.0 //-->
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Synergy</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>SYN1</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@SYNERGY_VERSION@</string>
+    <key>CFBundleVersion</key>
+    <string>@SYNERGY_VERSION@</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>© 2012-2016, Symless Ltd</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.9.0</string>
+  </dict>
+</plist>
diff --git a/src/gui/res/mac/Synergy.icns b/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns
similarity index 100%
rename from src/gui/res/mac/Synergy.icns
rename to dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns
diff --git a/dist/macos/bundle/Synergy.app/PkgInfo b/dist/macos/bundle/Synergy.app/PkgInfo
new file mode 100644
index 00000000..583e36af
--- /dev/null
+++ b/dist/macos/bundle/Synergy.app/PkgInfo
@@ -0,0 +1 @@
+APPLSYN1
\ No newline at end of file