diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile
index 882ea1005060..be7fb6682245 100644
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@@ -1,36 +1,38 @@
 PORTNAME=	astroid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16
 PORTREVISION=	6
 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+
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc \
 		notmuch>0:mail/notmuch
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
 		libgmime-3.0.so:mail/gmime30 \
 		libgnutls.so:security/gnutls \
 		libpcre2-8.so:devel/pcre2 \
 		libpeas-1.0.so:devel/libpeas \
 		libprotobuf.so:devel/protobuf \
 		libsass.so:textproc/libsass \
 		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	notmuch:mail/notmuch
 
-USES=		cmake compiler:c++14-lang desktop-file-utils gettext-runtime gnome \
+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 gdkpixbuf2 glib20 glibmm gtk30 \
 		gtkmm30 introspection libsigc++20 pango pangomm vte3
 
+USE_CXXSTD=	c++17
+
 .include <bsd.port.mk>
diff --git a/mail/astroid/files/patch-CMakeLists.txt b/mail/astroid/files/patch-CMakeLists.txt
deleted file mode 100644
index 738a688ce8c8..000000000000
--- a/mail/astroid/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2019-08-08 06:21:44 UTC
-+++ CMakeLists.txt
-@@ -543,7 +543,7 @@ install ( TARGETS tvextension
- # Install man page
- if (NOT DISABLE_DOCS)
-   install ( FILES ${CMAKE_BINARY_DIR}/astroid.1.gz
--    DESTINATION share/man/man1
-+    DESTINATION man/man1
-     )
- endif ()
- 
diff --git a/mail/astroid/pkg-plist b/mail/astroid/pkg-plist
index 0a878b11d471..38f645adc763 100644
--- a/mail/astroid/pkg-plist
+++ b/mail/astroid/pkg-plist
@@ -1,28 +1,28 @@
 bin/astroid
 lib/astroid/web-extensions/libtvextension.so
 lib/girepository-1.0/Astroid-0.2.typelib
-man/man1/astroid.1.gz
 share/applications/astroid.desktop
 %%DATADIR%%/ui/edit-message.glade
 %%DATADIR%%/ui/icons/LICENSE
 %%DATADIR%%/ui/icons/astroid.png
 %%DATADIR%%/ui/icons/astroid.svg
 %%DATADIR%%/ui/icons/horizontal_color.png
 %%DATADIR%%/ui/icons/horizontal_color.svg
 %%DATADIR%%/ui/icons/horizontal_white.png
 %%DATADIR%%/ui/icons/horizontal_white.svg
 %%DATADIR%%/ui/icons/icon_color.png
 %%DATADIR%%/ui/icons/icon_color.svg
 %%DATADIR%%/ui/icons/icon_white.png
 %%DATADIR%%/ui/icons/icon_white.svg
 %%DATADIR%%/ui/icons/vertical_color.png
 %%DATADIR%%/ui/icons/vertical_color.svg
 %%DATADIR%%/ui/icons/vertical_white.png
 %%DATADIR%%/ui/icons/vertical_white.svg
 %%DATADIR%%/ui/no-mail.png
 %%DATADIR%%/ui/part.scss
 %%DATADIR%%/ui/thread-view.html
 %%DATADIR%%/ui/thread-view.scss
 share/gir-1.0/Astroid-0.2.gir
 share/icons/hicolor/512x512/apps/astroid.png
 share/icons/hicolor/scalable/apps/astroid.svg
+share/man/man1/astroid.1.gz