diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index c11f77726d34..b0b7725326c2 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	pysolfc
-DISTVERSION=	2.18.0
+DISTVERSION=	2.20.0
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
 		SF/${PORTNAME}/PySolFC-Cardsets/minimal/:cardsets \
 		SF/${PORTNAME}/PySol-Music/${MUSICDIR}/:music
 DISTFILES=	${PYSOLFCDIST} \
 		${CARDSETDIST}:cardsets \
 		${MUSICDIST}:music
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Solitaire game, written in Python and the successor of PySol
 WWW=		https://pysolfc.sourceforge.io/
 
 LICENSE=	GPLv2+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =		${WRKDIR}/${CARDSETDIR}/cardset-2000/COPYRIGHT
 LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING
 LICENSE_DISTFILES_GPLv2+ =	${CARDSETDIST} ${MUSICDIST}
 LICENSE_DISTFILES_GPLv3+ =	${PYSOLFCDIST}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysol-cards>0:games/py-pysol-cards@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix tar:xz
 USE_PYTHON=	distutils noflavors autoplist
 SHEBANG_FILES=	data/themes/clearlooks/convert_imgs.sh
 NO_ARCH=	yes
 
 PLIST_FILES=	share/pixmaps/pysolfc.png
 DATADIR=	${PREFIX}/share/PySolFC
 WRKSRC=		${WRKDIR}/${PYSOLFCDIR}
 
 OPTIONS_DEFINE=	NLS PILLOW SOUND
 OPTIONS_DEFAULT=	PILLOW SOUND
 OPTIONS_SUB=	yes
 
 PILLOW_DESC=	Enhanced graphics support
 
 NLS_USES=	gettext
 
 PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
 SOUND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
 
 PYSOLFCDIR=	PySolFC-${DISTVERSION}
 PYSOLFCDIST=	${PYSOLFCDIR}${EXTRACT_SUFX}
-CARDSETDIR=	PySolFC-Cardsets--Minimal-2.1.0
+CARDSETDIR=	PySolFC-Cardsets--Minimal-2.2.0
 CARDSETDIST=	${CARDSETDIR}.tar.xz
 MUSICDIR=	PySol-Music-4.50
 MUSICDIST=	${MUSICDIR:tl}.tar.xz
 
 post-patch:
 	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
 	@${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \
 		-e 's|^Exec.*|Exec=${PORTNAME}|' \
 		${WRKSRC}/data/pysol.desktop
 	@${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \
 		${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's|^#%%NLS%%||' ${WRKSRC}/setup.py
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/pysol.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 post-install-SOUND-on:
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/games/pysolfc/distinfo b/games/pysolfc/distinfo
index 6f1fa6d38a46..4f56524881fd 100644
--- a/games/pysolfc/distinfo
+++ b/games/pysolfc/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1665467329
-SHA256 (pysolfc/PySolFC-2.18.0.tar.xz) = d33e01e70b8c56a77d9d300533e80c33007535e8e4c0fc87d782099d9e511089
-SIZE (pysolfc/PySolFC-2.18.0.tar.xz) = 9134632
-SHA256 (pysolfc/PySolFC-Cardsets--Minimal-2.1.0.tar.xz) = 42527d9ef49c6fd46a20076aee32b27d06c989ff55d02e25427d946021ce448c
-SIZE (pysolfc/PySolFC-Cardsets--Minimal-2.1.0.tar.xz) = 28484652
+TIMESTAMP = 1677471477
+SHA256 (pysolfc/PySolFC-2.20.0.tar.xz) = 630418c3694bbfbf0246a26d03d5b489cb1134c8ef9d5c30a34131697fb34ad0
+SIZE (pysolfc/PySolFC-2.20.0.tar.xz) = 9172284
+SHA256 (pysolfc/PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = 17e493dcbed080e22ca351ab907d01d6a9944aa7b7d86c20293b78c09c56a3e6
+SIZE (pysolfc/PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = 23145612
 SHA256 (pysolfc/pysol-music-4.50.tar.xz) = 3cfade86db88c1d97589c50441808ee082e68256be788012503818c42728783d
 SIZE (pysolfc/pysol-music-4.50.tar.xz) = 2144764