diff --git a/chronoshare.icns b/chronoshare.icns
new file mode 100644
index 0000000..2cf85f1
--- /dev/null
+++ b/chronoshare.icns
Binary files differ
diff --git a/osx/osxdist.py b/osx/osxdist.py
index 0291460..8925b5c 100644
--- a/osx/osxdist.py
+++ b/osx/osxdist.py
@@ -378,9 +378,9 @@
   a = AppBundle('ChronoShare.app', ver)
   a.copy_qt_plugins()
   a.handle_libs()
-  a.copy_resources(['../gui/images', '../gui/html', '../osx/qt.conf', '../osx/dsa_pub.pem'])
+  a.copy_resources(['../chronoshare.icns', '../gui/images', '../gui/html', '../osx/qt.conf', '../osx/dsa_pub.pem'])
   a.update_plist()
-  a.set_min_macosx_version('10.6.0')
+  a.set_min_macosx_version('10.8.0')
   a.done()
 
   # Sign our binaries, etc.
diff --git a/wscript b/wscript
index 86d4e4f..2b9b5db 100644
--- a/wscript
+++ b/wscript
@@ -229,6 +229,8 @@
 <dict>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
+    <key>CFBundleIconFile</key>
+    <string>chronoshare.icns</string>
     <key>CFBundleGetInfoString</key>
     <string>Created by Waf</string>
     <key>CFBundleIdentifier</key>
@@ -243,10 +245,13 @@
     <string>1</string>
     <key>SUPublicDSAKeyFile</key>
     <string>dsa_pub.pem</string>
+    <key>CFBundleIconFile</key>
+    <string>chronoshare.icns</string>
 </dict>
 </plist>'''
         qt.mac_app = "ChronoShare.app"
         qt.mac_plist = app_plist % "ChronoShare"
+        qt.mac_resources = 'chronoshare.icns'
         qt.use += " OSX_FOUNDATION OSX_COREWLAN adhoc"
 
         if bld.env['HAVE_SPARKLE']: