diff --git a/.github/workflows/macos-package.yml b/.github/workflows/macos-package.yml
new file mode 100644
index 00000000..f0bacbad
--- /dev/null
+++ b/.github/workflows/macos-package.yml
@@ -0,0 +1,56 @@
+name: macOS package
+
+on:
+  push:
+    tags: [ '**' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-10.15
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --no-binary=Pillow \
+          Pillow attrs configobj py2app pycotap pysol-cards random2 setuptools six
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        brew install create-dmg
+    - name: Get cardsets
+      run: |
+        wget --content-disposition https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.2.tar.xz
+        tar xJf PySolFC-Cardsets--Minimal-2.0.2.tar.xz
+        mv PySolFC-Cardsets--Minimal-2.0.2/cardset-* data
+    - name: Prepare game rules (process the HTML) and translations
+      run: |
+        make rules mo
+    - name: Create the executable .app
+      run: |
+        PYTHONPATH="." python setup_osx.py py2app
+        zip -q -r -X PySolFC-app.zip dist
+    - name: Make the .dmg for easy installation
+      run:
+        create-dmg --volname "Install PySolFC"
+        --volicon data/PySol.icns
+        --background html-src/images/pysollogo01.png
+        --window-size 800 400
+        --icon PySolFC.app 200 185
+        --app-drop-link 600 185
+        --skip-jenkins
+        PySolFC.dmg dist
+    - name: Upload zipped app
+      uses: actions/upload-artifact@v2
+      with:
+        name: pysolfc-app
+        path: PySolFC-app.zip
+    - name: Upload dmg
+      uses: actions/upload-artifact@v2
+      with:
+        name: pysolfc-dmg
+        path: PySolFC.dmg
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37be00d4..f5f839b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ for general guidelines for contributing to open source.
 
 # Contribution constraints
 
-- The [Travis-CI build](https://travis-ci.org/shlomif/PySolFC) and [AppVeyor build](https://ci.appveyor.com/project/shlomif/pysolfc) (which also run the test suite) should pass on each commit.
+- The [GitHub Actions CI build](https://github.com/shlomif/PySolFC/actions) and [AppVeyor build](https://ci.appveyor.com/project/shlomif/pysolfc) (which also run the test suite) should pass on each commit.
 - Your contributions should be under [GPLv3+](https://en.wikipedia.org/wiki/GNU_General_Public_License#Version_3) or a [compatible free software licence](https://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses), but please don't put them under the [AGPL](https://en.wikipedia.org/wiki/Affero_General_Public_License), which adds additional restrictions.
 - The code should be compatible with both Python 2.7.x and Python 3.4.x-and-above.
 
@@ -53,7 +53,8 @@ In order to publish a new version, follow these steps:
 5. `git tag pysolfc-2.6.5` (or equivalent version).
 6. `git push` and `git push --tags` to https://github.com/shlomif/PySolFC .
 7. Wait for the AppVeyor build for the tag to complete and scan the .exe using https://www.virustotal.com/ .
-8. Run `gmake dist`.
-9. Use [rexz9](https://github.com/shlomif/shlomif-computer-settings/blob/567b6ab3f4272ad66bf331536dc80bf58bfff3af/shlomif-settings/bash-aliases/user_aliases.bash#L57) on `dist/PySol*.tar.xz`.
-10. Go to https://sourceforge.net/projects/pysolfc/files/PySolFC/ and add a folder called PySolFC-2.6.5 (note the capitalisation).
-11. Add the tar.xz and the .exe there and mark them as defaults for the right OSes.
+8. Grab the macOS installer (.dmg) from [GitHub Actions](https://github.com/shlomif/PySolFC/actions/workflows/macos-package.yml) (look for an artifact called `pysolfc-dmg`).
+9. Run `gmake dist`.
+10. Use [rexz9](https://github.com/shlomif/shlomif-computer-settings/blob/567b6ab3f4272ad66bf331536dc80bf58bfff3af/shlomif-settings/bash-aliases/user_aliases.bash#L57) on `dist/PySol*.tar.xz`.
+11. Go to https://sourceforge.net/projects/pysolfc/files/PySolFC/ and add a folder called PySolFC-2.6.5 (note the capitalisation).
+12. Add the tar.xz, the .exe and the .dmg there and mark them as defaults for the right OSes.