diff --git a/atom.gyp b/atom.gyp
index 8064ced50f2a..eef5641357c1 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -5,6 +5,9 @@
     'app_sources': [
       'app/atom_main.cc',
     ],
+    'bundle_sources': [
+      'browser/mac/atom.icns',
+    ],
     'coffee_sources': [
       'browser/api/lib/app.coffee',
       'browser/api/lib/atom_delegate.coffee',
@@ -126,6 +129,9 @@
       'sources': [
         '<@(app_sources)',
       ],
+      'mac_bundle_resources': [
+        '<@(bundle_sources)',
+      ],
       'include_dirs': [
         '.',
       ],
diff --git a/browser/mac/Info.plist b/browser/mac/Info.plist
index 0056061c7d75..07bc63281af4 100644
--- a/browser/mac/Info.plist
+++ b/browser/mac/Info.plist
@@ -6,9 +6,11 @@
 	<string>com.github.atom</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
+  <key>CFBundleIconFile</key>
+  <string>atom.icns</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
-	<string>BRYApplication</string>
+	<string>AtomApplication</string>
 </dict>
 </plist>
diff --git a/browser/mac/atom.icns b/browser/mac/atom.icns
new file mode 100644
index 000000000000..2713bf8f2893
Binary files /dev/null and b/browser/mac/atom.icns differ