diff --git a/mac-setup/Info.plist b/mac-setup/Info.plist
new file mode 100644
index 00000000..87e079be
--- /dev/null
+++ b/mac-setup/Info.plist
@@ -0,0 +1,95 @@
+<?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>CFBundleDocumentTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+          <string>xopp</string>
+          <string>XOPP</string>
+          <string>xopt</string>
+          <string>XOPT</string>
+          <string>xoj</string>
+          <string>XOJ</string>
+        </array>
+        <key>CFBundleTypeIconFile</key>
+        <string>xournalpp.icns</string>
+        <key>CFBundleTypeMIMETypes</key>
+        <array>
+          <string>application/xopp</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>Xournal++ Document</string>
+        <key>CFBundleTypeOSTypes</key>
+        <array>
+          <string>XOPP </string>
+        </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>LSIsAppleDefaultForType</key>
+        <true/>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>com.github.xournalpp.xcf</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+          <string>pdf</string>
+          <string>PDF</string>
+        </array>
+        <key>CFBundleTypeMIMETypes</key>
+        <array>
+          <string>application/pdf</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>NSPDFPboardType</string>
+        <key>CFBundleTypeOSTypes</key>
+        <array>
+          <string>PDF </string>
+        </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>LSIsAppleDefaultForType</key>
+        <true/>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>com.adobe.pdf</string>
+        </array>
+        <key>NSDocumentClass</key>
+        <string>PVPDFDocument</string>
+      </dict>
+    </array>
+    <key>CFBundleExecutable</key>
+    <string>xournalpp</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Tablet Notetaking Application</string>
+    <key>CFBundleIconFile</key>
+    <string>xournalpp.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.github.xournalpp</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Xournal++ 1.0.6</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0.6-alpha</string>
+    <key>CFBundleSignature</key>
+    <string>Xournal++</string>
+    <key>CFBundleVersion</key>
+    <string>1.0.6-alpha</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>© 2010-2019 Xournal++ Team</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/mac-setup/build-app.sh b/mac-setup/build-app.sh
index d384e6c3..12c35a72 100755
--- a/mac-setup/build-app.sh
+++ b/mac-setup/build-app.sh
@@ -29,6 +29,10 @@ echo "prepare package"
 
 mkdir -p Xournal++.app/Contents/MacOS
 cp ../build/src/xournalpp ./Xournal++.app/Contents/MacOS/xournalpp
-./macdylibbundler/macdylibbundler -od -b -x ./Xournal++.app/Contents/MacOS/xournalpp -d ./Xournal++.app/Contents/libs/
+./macdylibbundler/dylibbundler -od -b -x ./Xournal++.app/Contents/MacOS/xournalpp -d ./Xournal++.app/Contents/libs/
+
+cp icon/xournalpp.icns ./Xournal++.app/Contents/Resources/xournalpp.icns
+cp Info.plist ./Xournal++.app/Contents/Info.plist
+
 
 echo "finished"
diff --git a/mac-setup/icon/Icon1024.png b/mac-setup/icon/Icon1024.png
new file mode 100644
index 00000000..fd7b13e3
Binary files /dev/null and b/mac-setup/icon/Icon1024.png differ
diff --git a/mac-setup/icon/create-icns.sh b/mac-setup/icon/create-icns.sh
new file mode 100755
index 00000000..5f982b02
--- /dev/null
+++ b/mac-setup/icon/create-icns.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# https://stackoverflow.com/questions/12306223/how-to-manually-create-icns-files-using-iconutil
+mkdir MyIcon.iconset
+sips -z 16 16     Icon1024.png --out MyIcon.iconset/icon_16x16.png
+sips -z 32 32     Icon1024.png --out MyIcon.iconset/icon_16x16@2x.png
+sips -z 32 32     Icon1024.png --out MyIcon.iconset/icon_32x32.png
+sips -z 64 64     Icon1024.png --out MyIcon.iconset/icon_32x32@2x.png
+sips -z 128 128   Icon1024.png --out MyIcon.iconset/icon_128x128.png
+sips -z 256 256   Icon1024.png --out MyIcon.iconset/icon_128x128@2x.png
+sips -z 256 256   Icon1024.png --out MyIcon.iconset/icon_256x256.png
+sips -z 512 512   Icon1024.png --out MyIcon.iconset/icon_256x256@2x.png
+sips -z 512 512   Icon1024.png --out MyIcon.iconset/icon_512x512.png
+cp Icon1024.png MyIcon.iconset/icon_512x512@2x.png
+iconutil -c icns MyIcon.iconset
+rm -R MyIcon.iconset
diff --git a/mac-setup/icon/xournalpp.icns b/mac-setup/icon/xournalpp.icns
new file mode 100644
index 00000000..bd297819
Binary files /dev/null and b/mac-setup/icon/xournalpp.icns differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ac869cf..7ee068c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,8 @@ add_definitions (-g -Wreturn-type -Wuninitialized -Wunused-value -Wunused-variab
 if (WIN32)
   # optimize for size (the Windows .exe is really big)
   set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-Os -s")
+elseif (APPLE)
+  # Nothing to do for APPLE
 else ()
   add_definitions (-rdynamic)
 endif ()