diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 4e0d80f44bf8..55881285d294 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	cone
-DISTVERSION=	1.17
+DISTVERSION=	1.18
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
 #		http://www.lerctr.org/~ler/
 # This is for release versions, leave it in please:
 MASTER_SITES=	SF/courier/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 WWW=		https://www.courier-mta.org/cone/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 BUILD_DEPENDS=	gnupg>0:security/gnupg
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libcourier-unicode.so:devel/courier-unicode \
 		libidn2.so:dns/libidn2
 RUN_DEPENDS=	gnupg>0:security/gnupg
 
 USES=		gettext gmake gnome iconv ldap localbase:ldflags ncurses perl5 \
 		pkgconfig shebangfix ssl tar:bzip2
 USE_GNOME=	libxml2
 
 SHEBANG_FILES=	sysconftool
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--with-certdb=${PREFIX}/share/cone/rootcerts \
 		--with-notice=unicode
 
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
 	@${RM} ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index db07eaa36c7d..aabbe943e9f4 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761471250
-SHA256 (cone-1.17.tar.bz2) = d51e2548ed98d5824a5f94fe66ed563fb8c4b57fddc6634d5c557aa13bf329ec
-SIZE (cone-1.17.tar.bz2) = 4275564
+TIMESTAMP = 1768244343
+SHA256 (cone-1.18.tar.bz2) = f05c51f70ce7ad48cf433e071a303f9a7ed57c2b986171fbc51821ebeb30475e
+SIZE (cone-1.18.tar.bz2) = 4298978
diff --git a/mail/cone/files/patch-libs_rfc2045_rfc2045.h b/mail/cone/files/patch-libs_rfc2045_rfc2045.h
deleted file mode 100644
index af387f7e7dd7..000000000000
--- a/mail/cone/files/patch-libs_rfc2045_rfc2045.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/rfc2045/rfc2045.h.orig	2025-10-06 09:00:02 UTC
-+++ libs/rfc2045/rfc2045.h
-@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder<out_iter, src_type>::decode(
- 
- 	if (decode_header)
- 	{
--		typename rfc2045::entity::line_iter<crlf>::headers<
-+		typename rfc2045::entity::line_iter<crlf>::template headers<
- 			src_type> parser{e, src	};
- 
- 		parser.name_lc=header_name_lc;
diff --git a/mail/cone/files/patch-libs_rfc2045_testsuitecpp.C b/mail/cone/files/patch-libs_rfc2045_testsuitecpp.C
deleted file mode 100644
index 649fadc8ea79..000000000000
--- a/mail/cone/files/patch-libs_rfc2045_testsuitecpp.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/rfc2045/testsuitecpp.C.orig	2025-10-04 09:00:06 UTC
-+++ libs/rfc2045/testsuitecpp.C
-@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t
- 		auto b=s.begin();
- 		auto e=s.end();
- 
--		typename rfc2045::entity::line_iter<crlf>::iter<
-+		typename rfc2045::entity::line_iter<crlf>::template iter<
- 			std::string_view::iterator,
- 			std::string_view::iterator
- 			>
diff --git a/mail/cone/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/cone/files/patch-libs_rfc2045_testsuitecpp2.C
deleted file mode 100644
index 353465b17a71..000000000000
--- a/mail/cone/files/patch-libs_rfc2045_testsuitecpp2.C
+++ /dev/null
@@ -1,29 +0,0 @@
---- libs/rfc2045/testsuitecpp2.C.orig	2025-09-10 09:00:05 UTC
-+++ libs/rfc2045/testsuitecpp2.C
-@@ -217,7 +217,7 @@ void test3()
- 	auto b=std::istreambuf_iterator<char>{ss};
- 	auto e=std::istreambuf_iterator<char>{};
- 
--	typename rfc2045::entity::line_iter<crlf>::iter<
-+	typename rfc2045::entity::line_iter<crlf>::template iter<
- 		std::istreambuf_iterator<char>,
- 		std::istreambuf_iterator<char>
- 		> iter{b, e};
-@@ -310,7 +310,7 @@ void test4()
- 	auto b=std::istreambuf_iterator<char>{ss};
- 	auto e=std::istreambuf_iterator<char>{};
- 
--	typename rfc2045::entity::line_iter<crlf>::iter<
-+	typename rfc2045::entity::line_iter<crlf>::template iter<
- 		std::istreambuf_iterator<char>,
- 		std::istreambuf_iterator<char>
- 		> iter{b, e};
-@@ -488,7 +488,7 @@ void test5()
- 	auto b=std::istreambuf_iterator<char>{ss};
- 	auto e=std::istreambuf_iterator<char>{};
- 
--	typename rfc2045::entity::line_iter<crlf>::iter<
-+	typename rfc2045::entity::line_iter<crlf>::template iter<
- 		std::istreambuf_iterator<char>,
- 		std::istreambuf_iterator<char>
- 		> iter{b, e};