diff --git a/deskutils/calendar-data/Makefile b/deskutils/calendar-data/Makefile
index f6c06c67017e..a3a15cca6175 100644
--- a/deskutils/calendar-data/Makefile
+++ b/deskutils/calendar-data/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	calendar-data
-DISTVERSION=	2020.10
+DISTVERSION=	2022.04
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Calendar files for the BSD calendar program
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 		cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOCALBASE}/share/calendar
 
 .include <bsd.port.mk>
diff --git a/deskutils/calendar-data/distinfo b/deskutils/calendar-data/distinfo
index ba48fd16edd5..eee14e6947a5 100644
--- a/deskutils/calendar-data/distinfo
+++ b/deskutils/calendar-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603556121
-SHA256 (freebsd-calendar-data-v2020.10_GH0.tar.gz) = 38add47f8bab52ca893dcee41d3ded958635da844599fc82a317e576449985ef
-SIZE (freebsd-calendar-data-v2020.10_GH0.tar.gz) = 85899
+TIMESTAMP = 1651244419
+SHA256 (freebsd-calendar-data-v2022.04_GH0.tar.gz) = f95c51a56f30d03c8d2fe8bbc31cb74de864cebe72747f05ebb56b37e6c9db39
+SIZE (freebsd-calendar-data-v2022.04_GH0.tar.gz) = 82510
diff --git a/deskutils/calendar-data/pkg-plist b/deskutils/calendar-data/pkg-plist
index 44dfba8758c2..947e61a4b30c 100644
--- a/deskutils/calendar-data/pkg-plist
+++ b/deskutils/calendar-data/pkg-plist
@@ -1,64 +1,55 @@
 share/calendar/calendar.all
 share/calendar/calendar.australia
+share/calendar/calendar.austria
 share/calendar/calendar.birthday
 share/calendar/calendar.brazilian
 share/calendar/calendar.christian
 share/calendar/calendar.computer
 share/calendar/calendar.croatian
 share/calendar/calendar.dutch
 share/calendar/calendar.french
 share/calendar/calendar.german
 share/calendar/calendar.history
 share/calendar/calendar.holiday
 share/calendar/calendar.hungarian
 share/calendar/calendar.judaic
 share/calendar/calendar.lotr
 share/calendar/calendar.music
 share/calendar/calendar.newzealand
 share/calendar/calendar.russian
 share/calendar/calendar.southafrica
 share/calendar/calendar.ukrainian
 share/calendar/calendar.usholiday
 share/calendar/calendar.world
-share/calendar/de_AT.ISO_8859-15/calendar.feiertag
-share/calendar/de_DE.ISO8859-1/calendar.all
-share/calendar/de_DE.ISO8859-1/calendar.feiertag
-share/calendar/de_DE.ISO8859-1/calendar.geschichte
-share/calendar/de_DE.ISO8859-1/calendar.kirche
-share/calendar/de_DE.ISO8859-1/calendar.literatur
-share/calendar/de_DE.ISO8859-1/calendar.musik
-share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
-share/calendar/fr_FR.ISO8859-1/calendar.all
-share/calendar/fr_FR.ISO8859-1/calendar.fetes
-share/calendar/fr_FR.ISO8859-1/calendar.french
-share/calendar/fr_FR.ISO8859-1/calendar.jferies
-share/calendar/fr_FR.ISO8859-1/calendar.proverbes
-share/calendar/hr_HR.ISO8859-2/calendar.all
-share/calendar/hr_HR.ISO8859-2/calendar.praznici
-share/calendar/hu_HU.ISO8859-2/calendar.all
-share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
-share/calendar/hu_HU.ISO8859-2/calendar.unnepek
-share/calendar/pt_BR.ISO8859-1/calendar.all
-share/calendar/pt_BR.ISO8859-1/calendar.commemorative
-share/calendar/pt_BR.ISO8859-1/calendar.holidays
-share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
+share/calendar/de_AT.UTF-8/calendar.feiertag
+share/calendar/de_DE.UTF-8/calendar.all
+share/calendar/de_DE.UTF-8/calendar.feiertag
+share/calendar/de_DE.UTF-8/calendar.geschichte
+share/calendar/de_DE.UTF-8/calendar.kirche
+share/calendar/de_DE.UTF-8/calendar.literatur
+share/calendar/de_DE.UTF-8/calendar.musik
+share/calendar/de_DE.UTF-8/calendar.wissenschaft
+share/calendar/fr_FR.UTF-8/calendar.all
+share/calendar/fr_FR.UTF-8/calendar.fetes
+share/calendar/fr_FR.UTF-8/calendar.french
+share/calendar/fr_FR.UTF-8/calendar.jferies
+share/calendar/fr_FR.UTF-8/calendar.proverbes
+share/calendar/hr_HR.UTF-8/calendar.all
+share/calendar/hr_HR.UTF-8/calendar.praznici
+share/calendar/hu_HU.UTF-8/calendar.all
+share/calendar/hu_HU.UTF-8/calendar.nevnapok
+share/calendar/hu_HU.UTF-8/calendar.unnepek
 share/calendar/pt_BR.UTF-8/calendar.all
 share/calendar/pt_BR.UTF-8/calendar.commemorative
 share/calendar/pt_BR.UTF-8/calendar.holidays
 share/calendar/pt_BR.UTF-8/calendar.mcommemorative
-share/calendar/ru_RU.KOI8-R/calendar.all
-share/calendar/ru_RU.KOI8-R/calendar.common
-share/calendar/ru_RU.KOI8-R/calendar.holiday
-share/calendar/ru_RU.KOI8-R/calendar.military
-share/calendar/ru_RU.KOI8-R/calendar.orthodox
-share/calendar/ru_RU.KOI8-R/calendar.pagan
 share/calendar/ru_RU.UTF-8/calendar.all
 share/calendar/ru_RU.UTF-8/calendar.common
 share/calendar/ru_RU.UTF-8/calendar.holiday
 share/calendar/ru_RU.UTF-8/calendar.military
 share/calendar/ru_RU.UTF-8/calendar.orthodox
 share/calendar/ru_RU.UTF-8/calendar.pagan
-share/calendar/uk_UA.KOI8-U/calendar.all
-share/calendar/uk_UA.KOI8-U/calendar.holiday
-share/calendar/uk_UA.KOI8-U/calendar.misc
-share/calendar/uk_UA.KOI8-U/calendar.orthodox
+share/calendar/uk_UA.UTF-8/calendar.all
+share/calendar/uk_UA.UTF-8/calendar.holiday
+share/calendar/uk_UA.UTF-8/calendar.misc
+share/calendar/uk_UA.UTF-8/calendar.orthodox