diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 1164c09853ad..d8a8ed8981d0 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -1,32 +1,33 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	baobab
-PORTVERSION=	3.38.0
+PORTVERSION=	40.0
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 graphical directory tree analyzer
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limitw:1,even
 
 BUILD_DEPENDS=	valac:lang/vala \
 		itstool:textproc/itstool
+LIB_DEPENDS=	libhandy-1.so:x11-toolkits/libhandy
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
 		python:3.5+,build tar:xz
 USE_GNOME=	cairo gtk30
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 GLIB_SCHEMAS=	org.gnome.baobab.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|MimeType=inode/directory;|MimeType=|g' \
 		${WRKSRC}/data/org.gnome.baobab.desktop.in
 
 .include <bsd.port.mk>
diff --git a/deskutils/baobab/distinfo b/deskutils/baobab/distinfo
index 3fef9fd81bc8..1c647202a2bf 100644
--- a/deskutils/baobab/distinfo
+++ b/deskutils/baobab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600328352
-SHA256 (gnome/baobab-3.38.0.tar.xz) = 048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
-SIZE (gnome/baobab-3.38.0.tar.xz) = 579948
+TIMESTAMP = 1628010681
+SHA256 (gnome/baobab-40.0.tar.xz) = a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7
+SIZE (gnome/baobab-40.0.tar.xz) = 581744