diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 0263d00bb0ae..19833dd3c9fc 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	8
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
index caf195f0bc20..fb3a39b563ca 100644
--- a/mail/claws-mail-plugins/Makefile
+++ b/mail/claws-mail-plugins/Makefile
@@ -1,7 +1,7 @@
 # Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
 
 PORTNAME=	claws-mail-plugins
-PORTVERSION=	3.17.8
+PORTVERSION=	3.18.0
 CATEGORIES=	mail news
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 008f5a3abe31..e57b86437d03 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -11,6 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libetpan.so:mail/libetpan \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libsasl2.so:security/cyrus-sasl2 \
 		libgnutls.so:security/gnutls \
 		libgcrypt.so:security/libgcrypt \
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 4a1290e114be..3a213edd4e5f 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,4 +1,4 @@
-PORTVERSION=	3.17.8
+PORTVERSION=	3.18.0
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index cd033e36152c..42a80325ecb1 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,3 +1,4 @@
-TIMESTAMP = 1605298492
-SHA256 (claws-mail-3.17.8.tar.xz) = cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
-SIZE (claws-mail-3.17.8.tar.xz) = 6435692
+TIMESTAMP = 1626114302
+SHA256 (claws-mail-3.18.0.tar.xz) = cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+SHA512 (claws-mail-3.18.0.tar.xz) = 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
+SIZE (claws-mail-3.18.0.tar.xz) = 6517632
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 630725bf1c44..32fd820e5fd6 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -161,6 +161,7 @@ include/claws-mail/mutt.h
 include/claws-mail/news.h
 include/claws-mail/news_gtk.h
 include/claws-mail/noticeview.h
+include/claws-mail/oauth2.h
 include/claws-mail/partial_download.h
 include/claws-mail/password.h
 include/claws-mail/password_gtk.h