diff --git a/macos/Podfile b/macos/Podfile
index 22966c3f..b9bae3ab 100644
--- a/macos/Podfile
+++ b/macos/Podfile
@@ -36,5 +36,8 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_macos_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
+    end
   end
 end
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 241265a5..2eda041b 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -173,6 +173,6 @@ SPEC CHECKSUMS:
   WebRTC-SDK: 566e58d2916cb79d770350169a449ea523f5db7c
   window_to_front: 4cdc24ddd8461ad1a55fa06286d6a79d8b29e8d8
 
-PODFILE CHECKSUM: 9b8d08a513b178c33212d1b54cc9e3cba756d95b
+PODFILE CHECKSUM: d0975b16fbdecb73b109d8fbc88aa77ffe4c7a8d
 
 COCOAPODS: 1.12.1
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024-mac.png
new file mode 100644
index 00000000..7d0807b3
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/128-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/128-mac.png
new file mode 100644
index 00000000..86e89d95
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/128-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/16-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/16-mac.png
new file mode 100644
index 00000000..77ef66d1
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/16-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/256-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/256-mac.png
new file mode 100644
index 00000000..b1634c7a
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/256-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/32-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/32-mac.png
new file mode 100644
index 00000000..7b22bd48
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/32-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/512-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/512-mac.png
new file mode 100644
index 00000000..c0a9729d
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/512-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/64-mac.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/64-mac.png
new file mode 100644
index 00000000..ef2962a7
Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/64-mac.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index a2ec33f1..eba1335b 100644
--- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1 @@
-{
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"1024x1024","filename":"1024-mac.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]}
\ No newline at end of file
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
deleted file mode 100644
index fb1434bf..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
deleted file mode 100644
index 34d07d5e..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
deleted file mode 100644
index e78ba905..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
deleted file mode 100644
index f7508e35..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
deleted file mode 100644
index 6154ba14..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
deleted file mode 100644
index 6245280e..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and /dev/null differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
deleted file mode 100644
index 7de4d1f3..00000000
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and /dev/null differ
diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
new file mode 100755
index 00000000..8d4368b0
--- /dev/null
+++ b/scripts/build-macos.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+git apply ./scripts/enable-android-google-services.patch
+FLUFFYCHAT_ORIG_GROUP="im.fluffychat"
+FLUFFYCHAT_ORIG_TEAM="4NXF6Z997G"
+#FLUFFYCHAT_NEW_GROUP="com.example.fluffychat"
+#FLUFFYCHAT_NEW_TEAM="ABCDE12345"
+
+# In some cases (ie: running beta XCode releases) some pods haven't updated their minimum version
+# but XCode will reject the package for using too old of a minimum version. 
+# This will fix that, but. Well. Use at your own risk.
+# export I_PROMISE_IM_REALLY_SMART=1
+
+# If you want to automatically install the app
+# export FLUFFYCHAT_INSTALL_IPA=1
+
+### Rotate IDs ###
+[ -n "${FLUFFYCHAT_NEW_GROUP}" ] && {
+	# App group IDs
+	sed -i "" "s/group.${FLUFFYCHAT_ORIG_GROUP}.app/group.${FLUFFYCHAT_NEW_GROUP}.app/g" "macos/Runner/Runner.entitlements"
+	sed -i "" "s/group.${FLUFFYCHAT_ORIG_GROUP}.app/group.${FLUFFYCHAT_NEW_GROUP}.app/g" "macos/Runner.xcodeproj/project.pbxproj"
+	# Bundle identifiers
+	sed -i "" "s/${FLUFFYCHAT_ORIG_GROUP}.app/${FLUFFYCHAT_NEW_GROUP}.app/g" "macos/Runner.xcodeproj/project.pbxproj"
+}
+
+[ -n "${FLUFFYCHAT_NEW_TEAM}" ] && {
+	# Code signing team
+	sed -i "" "s/${FLUFFYCHAT_ORIG_TEAM}/${FLUFFYCHAT_NEW_TEAM}/g" "macos/Runner.xcodeproj/project.pbxproj"
+}
+
+### Make release build ###
+flutter build macos --release
+
+cp /usr/local/Cellar/libolm/**/lib/libolm.3.dylib build/macos/Build/Products/Release/FluffyChat.app/Contents/MacOS/libolm.3.dylib
\ No newline at end of file
diff --git a/scripts/prepare-macos.sh b/scripts/prepare-macos.sh
new file mode 100755
index 00000000..95f2a9cf
--- /dev/null
+++ b/scripts/prepare-macos.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if ! type "flutter" > /dev/null; then
+	brew install flutter
+fi
+
+brew install libolm
+