diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile
index 3255bbbb325b..506e823f4d3a 100644
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@@ -1,40 +1,37 @@
 PORTNAME=	astroid
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16
-PORTREVISION=	16
+DISTVERSION=	0.17
 CATEGORIES=	mail
 
 MAINTAINER=	mylan.connolly@gmail.com
 COMMENT=	Graphical email client for notmuch, inspired by sup and others
 WWW=		https://astroidmail.github.io/
 
 LICENSE=	GPLv3+ LGPL21+
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING.GPL-3.0+
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPL-2.1+
 
-BROKEN=		fails to build with boost-1.85+
-
 BUILD_DEPENDS=	scdoc:textproc/scdoc \
 		notmuch>0:mail/notmuch
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libjavascriptcoregtk-4.0.so:www/webkit2-gtk@40 \
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libjavascriptcoregtk-4.1.so:www/webkit2-gtk@41 \
 		libgmime-3.0.so:mail/gmime30 \
 		libgnutls.so:security/gnutls \
 		libpcre2-8.so:devel/pcre2 \
 		libpeas-1.0.so:devel/libpeas1 \
 		libprotobuf.so:devel/protobuf \
 		libsass.so:textproc/libsass \
 		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	notmuch:mail/notmuch
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gettext-runtime gnome \
 		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	astroidmail
 USE_GNOME=	atk atkmm cairo cairomm gdkpixbuf glib20 glibmm gtk30 \
 		gtkmm30 introspection libsigc++20 pango pangomm vte3
 
 USE_CXXSTD=	c++17
 
 .include <bsd.port.mk>
diff --git a/mail/astroid/distinfo b/mail/astroid/distinfo
index d1496b79c9cc..7fa2ba81ffc1 100644
--- a/mail/astroid/distinfo
+++ b/mail/astroid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645195442
-SHA256 (astroidmail-astroid-v0.16_GH0.tar.gz) = 32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e
-SIZE (astroidmail-astroid-v0.16_GH0.tar.gz) = 3370206
+TIMESTAMP = 1756292988
+SHA256 (astroidmail-astroid-v0.17_GH0.tar.gz) = dd419d4e11d1efa95979472e17cca5066799a5c64a595d5cea2b9e8d9f60f9c8
+SIZE (astroidmail-astroid-v0.17_GH0.tar.gz) = 3371728
diff --git a/mail/astroid/files/patch-CMakeLists.txt b/mail/astroid/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1a920a83c15b
--- /dev/null
+++ b/mail/astroid/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2025-04-14 05:49:49 UTC
++++ CMakeLists.txt
+@@ -116,7 +116,6 @@ find_package ( Boost REQUIRED
+   log
+   thread
+   date_time
+-  system
+   )
+ 
+ find_package (Protobuf CONFIG)