diff --git a/devel/libvmime/Makefile b/devel/libvmime/Makefile
index 68e4d466533..db6725d3a61 100644
--- a/devel/libvmime/Makefile
+++ b/devel/libvmime/Makefile
@@ -2,10 +2,10 @@ COMMENT=	C++ class library for working with Internet mail
 
 GH_ACCOUNT=     kisli
 GH_PROJECT=     vmime
-GH_COMMIT=     	e2fc1911f17374ae5343c28ec52493f1dfdf09ab
+GH_COMMIT=     	fc69321d5304c73be685c890f3b30528aadcfeaf
 
 DISTNAME=	vmime
-PKGNAME=	libvmime-0.9.5
+PKGNAME=	libvmime-20230130
 
 SHARED_LIBS+=	vmime	4.0	# 0.0
 
diff --git a/devel/libvmime/distinfo b/devel/libvmime/distinfo
index d63916e8dae..8ea5a8268fa 100644
--- a/devel/libvmime/distinfo
+++ b/devel/libvmime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vmime-e2fc1911.tar.gz) = ksNRk+0MT6f0xWx9I8juGnZ7dmbOEDhpHtAybpCwyQg=
-SIZE (vmime-e2fc1911.tar.gz) = 526671
+SHA256 (vmime-fc69321d.tar.gz) = rrXlydu06b4c8qCsGxlxn42BsIyL5m5aOMex37eUjKs=
+SIZE (vmime-fc69321d.tar.gz) = 534382
diff --git a/devel/libvmime/patches/patch-src_vmime_charsetConverter_icu_cpp b/devel/libvmime/patches/patch-src_vmime_charsetConverter_icu_cpp
deleted file mode 100644
index d963b5cd309..00000000000
--- a/devel/libvmime/patches/patch-src_vmime_charsetConverter_icu_cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-From e96aeeb14dc51deeea70e6fdffa95f80af78fdfc Mon Sep 17 00:00:00 2001
-From: 0xd34df00d <0xd34df00d@gmail.com>
-Date: Sun, 22 Sep 2019 08:26:11 -0400
-Subject: [PATCH] Avoid extern "C" blocks around ICU includes
-
-Index: src/vmime/charsetConverter_icu.cpp
---- src/vmime/charsetConverter_icu.cpp.orig
-+++ src/vmime/charsetConverter_icu.cpp
-@@ -34,15 +34,12 @@
- #include "vmime/utility/outputStreamStringAdapter.hpp"
- 
- 
--extern "C" {
--
- #ifndef VMIME_BUILDING_DOC
- 
- 	#include <unicode/ucnv.h>
- 	#include <unicode/ucnv_err.h>
- 
- #endif // VMIME_BUILDING_DOC
--}
- 
- 
- #include <unicode/unistr.h>
diff --git a/devel/libvmime/pkg/PLIST b/devel/libvmime/pkg/PLIST
index 3def072c349..4a2a1309d85 100644
--- a/devel/libvmime/pkg/PLIST
+++ b/devel/libvmime/pkg/PLIST
@@ -81,6 +81,7 @@ include/vmime/net/imap/IMAPMessagePartContentHandler.hpp
 include/vmime/net/imap/IMAPMessageStructure.hpp
 include/vmime/net/imap/IMAPParser.hpp
 include/vmime/net/imap/IMAPSStore.hpp
+include/vmime/net/imap/IMAPSearchAttributes.hpp
 include/vmime/net/imap/IMAPServiceInfos.hpp
 include/vmime/net/imap/IMAPStore.hpp
 include/vmime/net/imap/IMAPTag.hpp
@@ -124,6 +125,7 @@ include/vmime/net/serviceFactory.hpp
 include/vmime/net/serviceInfos.hpp
 include/vmime/net/session.hpp
 include/vmime/net/smtp/
+include/vmime/net/smtp/DSNAttributes.hpp
 include/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
 include/vmime/net/smtp/SMTPCommand.hpp
 include/vmime/net/smtp/SMTPCommandSet.hpp
@@ -131,6 +133,7 @@ include/vmime/net/smtp/SMTPConnection.hpp
 include/vmime/net/smtp/SMTPExceptions.hpp
 include/vmime/net/smtp/SMTPResponse.hpp
 include/vmime/net/smtp/SMTPSTransport.hpp
+include/vmime/net/smtp/SMTPSendOptions.hpp
 include/vmime/net/smtp/SMTPServiceInfos.hpp
 include/vmime/net/smtp/SMTPTransport.hpp
 include/vmime/net/smtp/smtp.hpp
@@ -264,6 +267,12 @@ include/vmime/utility/urlUtils.hpp
 include/vmime/vmime.hpp
 include/vmime/word.hpp
 include/vmime/wordEncoder.hpp
-lib/libvmime.a
+lib/cmake/
+lib/cmake/vmime/
+lib/cmake/vmime/vmime-config${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/vmime/vmime-config.cmake
+lib/cmake/vmime/vmime-static-config${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/vmime/vmime-static-config.cmake
+@static-lib lib/libvmime.a
 @lib lib/libvmime.so.${LIBvmime_VERSION}
 lib/pkgconfig/vmime.pc