diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 00000000..fdff5fba
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,38 @@
+# vim: sts=2 sw=2 ai
+
+linux_task:
+  container:
+    image: gcc:latest
+
+  setup_script:
+    - git submodule update --init shaders/SPIRV-Cross
+    - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install meson gettext libsdl2-dev libgtk-3-dev libminizip-dev portaudio19-dev glslang-dev
+
+  compile_script:
+    - meson build gtk --buildtype=release --strip
+    - ninja -j2 -C build
+
+  package_script:
+    - mkdir snes9x
+    - cp -ar build/snes9x-gtk README.md LICENSE docs data gtk/AUTHORS snes9x/
+    - tar -caf "snes9x-${CIRRUS_CHANGE_IN_REPO}.txz" snes9x
+
+  build_artifacts:
+    path: "snes9x-${CIRRUS_CHANGE_IN_REPO}.txz"
+
+
+macOS_task:
+  osx_instance:
+    image: mojave-xcode
+
+  compile_script:
+    - xcodebuild -project macosx/snes9x.xcodeproj -target Snes9x -configuration Release build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+
+  package_script:
+    - mkdir snes9x
+    - cp -R macosx/build/Release/Snes9x.app macosx/docs README.md LICENSE snes9x/
+    - zip -r "snes9x-${CIRRUS_CHANGE_IN_REPO}.zip" snes9x
+
+  build_artifacts:
+    path: "snes9x-${CIRRUS_CHANGE_IN_REPO}.zip"
+
diff --git a/.gitignore b/.gitignore
index f0cf4db1..e6cf053c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -495,3 +495,7 @@ healthchecksdb
 MigrationBackup/
 
 # End of https://www.gitignore.io/api/c,c++,xcode,visualstudio
+
+# vim
+*.swp
+
diff --git a/README.md b/README.md
index 9014f5da..efe7f58d 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,12 @@
 This is the official source code repository for the Snes9x project.
 
 Please check the [Wiki](https://github.com/snes9xgit/snes9x/wiki) for additional information.
+
+## Nightly builds
+
+Download nightly builds from continuous integration:
+
+[![Build Status](https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=linux)](https://cirrus-ci.com/github/snes9xgit/snes9x)
+[![Build Status](https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=macOS)](https://cirrus-ci.com/github/snes9xgit/snes9x)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/snes9xgit/snes9x?branch=master&svg=true)](https://ci.appveyor.com/project/snes9x/snes9x)
+