diff --git a/.appveyor.yml b/.appveyor.yml
index d22656a4..7c3ed381 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -36,9 +36,9 @@ test_script:
     - gmake mo
     - pyinstaller pysol.py --windowed --icon=data\pysol.ico
     - python3 setup.py install_data -d dist\pysol
-    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download -FileName cardsets.tar.xz
+    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.2.0.tar.xz/download -FileName cardsets.tar.xz
     - 7z x cardsets.tar.xz -so | 7z x -si -ttar
-    - mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* dist/pysol/data
+    - mv PySolFC-Cardsets--Minimal-2.2.0/cardset-* dist/pysol/data
     - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz/download -FileName music.tar.xz
     - 7z x music.tar.xz -so | 7z x -si -ttar
     - move pysol-music-4.50\data\music dist\pysol\data\music
diff --git a/.github/workflows/macos-package.yml b/.github/workflows/macos-package.yml
index 914b7f20..6797c60f 100644
--- a/.github/workflows/macos-package.yml
+++ b/.github/workflows/macos-package.yml
@@ -28,9 +28,9 @@ jobs:
         brew install create-dmg
     - name: Get cardsets
       run: |
-        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download
-        tar xJf PySolFC-Cardsets--Minimal-2.1.0.tar.xz
-        mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* data
+        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.2.0.tar.xz/download
+        tar xJf PySolFC-Cardsets--Minimal-2.2.0.tar.xz
+        mv PySolFC-Cardsets--Minimal-2.2.0/cardset-* data
     - name: Prepare game rules (process the HTML) and translations
       run: |
         make rules mo
diff --git a/.travis.yml b/.travis.yml
index b9a22637..c32ad11d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,9 @@ deploy:
     skip_cleanup: true
 before_install:
     - if test "$TRAVIS_OS_NAME" = "osx" ; then
-        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download &&
-        tar xJf PySolFC-Cardsets--Minimal-2.1.0.tar.xz &&
-        mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* data ;
+        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.2.0.tar.xz/download &&
+        tar xJf PySolFC-Cardsets--Minimal-2.2.0.tar.xz &&
+        mv PySolFC-Cardsets--Minimal-2.2.0/cardset-* data ;
         fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then
         PYVER=3.9.1 &&
diff --git a/MANIFEST.in b/MANIFEST.in
index 87ba5562..0d5160bb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -93,6 +93,8 @@ graft data/cardset-louie-mantia-hanafuda
 graft data/cardset-mughal-ganjifa-xl
 graft data/cardset-dashavatara-ganjifa-xl
 graft data/cardset-next-matrix
+graft data/cardset-matching
+graft data/cardset-matching-xl
 ##
 ## exclude dirs
 ##
diff --git a/android/mkp4a.clean b/android/mkp4a.clean
index 03e87ea5..c8ea6f26 100755
--- a/android/mkp4a.clean
+++ b/android/mkp4a.clean
@@ -5,4 +5,4 @@ rm -rf tmp
 python3 -m pythonforandroid.toolchain clean_dists
 python3 -m pythonforandroid.toolchain clean_builds
 rm -f *.apk
-rm -rf PySolFC-Cardsets--Minimal-2.1.0
+rm -rf PySolFC-Cardsets--Minimal-2.2.0
diff --git a/android/mkp4a.common b/android/mkp4a.common
index 233e7250..f4114bbc 100644
--- a/android/mkp4a.common
+++ b/android/mkp4a.common
@@ -5,7 +5,7 @@ version=$(PYTHONPATH=.. python3 -c \
 
 tmpdir=${HOME}/.cache/tmp-for-p4a/pysolfc/src
 
-cardsets_dir='PySolFC-Cardsets--Minimal-2.1.0'
+cardsets_dir='PySolFC-Cardsets--Minimal-2.2.0'
 cardsets_file="${cardsets_dir}.tar.xz"
 
 p4aver="2019.10.6"
diff --git a/buildozer/buildozer.init b/buildozer/buildozer.init
index 40204f46..d9f169a5 100755
--- a/buildozer/buildozer.init
+++ b/buildozer/buildozer.init
@@ -2,7 +2,7 @@
 set -eux
 
 tmpdir=./tmp
-cardsets_dir=PySolFC-Cardsets--Minimal-2.1.0
+cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
 cardsets_file=${cardsets_dir}.tar.xz
 
 # NOTE: $1 will be set with fdroid builds only.
diff --git a/buildozer/fdroid.init b/buildozer/fdroid.init
index 0d5a1083..09f12b8c 100755
--- a/buildozer/fdroid.init
+++ b/buildozer/fdroid.init
@@ -2,7 +2,7 @@
 set -eux
 
 tmpdir=..
-cardsets_dir=PySolFC-Cardsets--Minimal-2.1.0
+cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
 cardsets_file=${cardsets_dir}.tar.xz
 
 echo '### prepare source'
diff --git a/buildozer/mkcards b/buildozer/mkcards
index a897fd52..0a9bf460 100755
--- a/buildozer/mkcards
+++ b/buildozer/mkcards
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 
-cardsets_dir=PySolFC-Cardsets--Minimal-2.1.0
+cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
 cardsets_file=${cardsets_dir}.tar.xz
 
 echo '### prepare cardsets'