diff --git a/.gitignore b/.gitignore
index d6b13bfb..4a043bdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ build/
 release/
 t/
 winbuild/
+macbuild/
+linuxbuild/
 *.dmf
 *.swp
 .cache/
diff --git a/res/icon.icns b/res/icon.icns
new file mode 100644
index 00000000..04d640cd
Binary files /dev/null and b/res/icon.icns differ
diff --git a/res/icon/icon_128x128.png b/res/icon.iconset/icon_128x128.png
similarity index 100%
rename from res/icon/icon_128x128.png
rename to res/icon.iconset/icon_128x128.png
diff --git a/res/icon/icon_128x128@2x.png b/res/icon.iconset/icon_128x128@2x.png
similarity index 100%
rename from res/icon/icon_128x128@2x.png
rename to res/icon.iconset/icon_128x128@2x.png
diff --git a/res/icon/icon_16x16.png b/res/icon.iconset/icon_16x16.png
similarity index 100%
rename from res/icon/icon_16x16.png
rename to res/icon.iconset/icon_16x16.png
diff --git a/res/icon/icon_16x16@2x.png b/res/icon.iconset/icon_16x16@2x.png
similarity index 100%
rename from res/icon/icon_16x16@2x.png
rename to res/icon.iconset/icon_16x16@2x.png
diff --git a/res/icon/icon_256x256.png b/res/icon.iconset/icon_256x256.png
similarity index 100%
rename from res/icon/icon_256x256.png
rename to res/icon.iconset/icon_256x256.png
diff --git a/res/icon/icon_256x256@2x.png b/res/icon.iconset/icon_256x256@2x.png
similarity index 100%
rename from res/icon/icon_256x256@2x.png
rename to res/icon.iconset/icon_256x256@2x.png
diff --git a/res/icon/icon_32x32.png b/res/icon.iconset/icon_32x32.png
similarity index 100%
rename from res/icon/icon_32x32.png
rename to res/icon.iconset/icon_32x32.png
diff --git a/res/icon/icon_32x32@2x.png b/res/icon.iconset/icon_32x32@2x.png
similarity index 100%
rename from res/icon/icon_32x32@2x.png
rename to res/icon.iconset/icon_32x32@2x.png
diff --git a/res/icon/icon_512x512.png b/res/icon.iconset/icon_512x512.png
similarity index 100%
rename from res/icon/icon_512x512.png
rename to res/icon.iconset/icon_512x512.png
diff --git a/res/icon/icon_512x512@2x.png b/res/icon.iconset/icon_512x512@2x.png
similarity index 100%
rename from res/icon/icon_512x512@2x.png
rename to res/icon.iconset/icon_512x512@2x.png
diff --git a/res/icon/icon_64x64.png b/res/icon.iconset/icon_64x64.png
similarity index 100%
rename from res/icon/icon_64x64.png
rename to res/icon.iconset/icon_64x64.png
diff --git a/res/icon/icon_64x64@2x.png b/res/icon.iconset/icon_64x64@2x.png
similarity index 100%
rename from res/icon/icon_64x64@2x.png
rename to res/icon.iconset/icon_64x64@2x.png
diff --git a/res/make-icon.sh b/res/make-icon.sh
index 97949b4a..ebb20fcf 100755
--- a/res/make-icon.sh
+++ b/res/make-icon.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 sizes=(16 32 64 128 256 512)
-if [ ! -e icon ]; then
-  mkdir icon
+if [ ! -e icon.iconset ]; then
+  mkdir icon.iconset
 fi
 for i in "${sizes[@]}"; do
   echo "making $i..."