diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index 20cc7b51aba4..911a05467bad 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -1,38 +1,38 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 
 PORTNAME=	gnome-calendar
-PORTVERSION=	3.38.2
+PORTVERSION=	40.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple and beautiful calendar application for GNOME
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libical.so:devel/libical \
 		libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libsoup-2.4.so:devel/libsoup \
 		libgweather-3.so:net/libgweather \
 		libgeoclue-2.so:net/geoclue \
 		libgeocode-glib.so:net/geocode-glib \
 		libgoa-1.0.so:net/gnome-online-accounts \
-		libhandy-0.0.so:x11-toolkits/libhandy0
+		libhandy-1.so:x11-toolkits/libhandy
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 desktop-file-utils gettext gnome \
 		localbase:ldflags meson pkgconfig python:3.4+,build tar:xz
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	cairo evolutiondataserver3 gtksourceview3
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.calendar.enums.xml \
 		org.gnome.calendar.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-calendar/distinfo b/deskutils/gnome-calendar/distinfo
index 3c5160fd8470..3c42c7095da1 100644
--- a/deskutils/gnome-calendar/distinfo
+++ b/deskutils/gnome-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608601535
-SHA256 (gnome/gnome-calendar-3.38.2.tar.xz) = d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
-SIZE (gnome/gnome-calendar-3.38.2.tar.xz) = 547228
+TIMESTAMP = 1629608470
+SHA256 (gnome/gnome-calendar-40.2.tar.xz) = 9e3701fd4a0e589800d225203770644f31d5234655f54a83a85ff0556dd7ea33
+SIZE (gnome/gnome-calendar-40.2.tar.xz) = 553344