diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 5d085458ae4d..5729c83999e0 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	courier-imap
-PORTVERSION=	5.3.1
+PORTVERSION=	5.3.2
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index e1b9ff11335e..9cbebe48070b 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761325457
-SHA256 (courier-imap-5.3.1.tar.bz2) = 7c6f02b437c4dcc1b3e137ab543b5cc9f9e54f01bc74d6ca0509a3efb41ddaa6
-SIZE (courier-imap-5.3.1.tar.bz2) = 3732996
+TIMESTAMP = 1768306040
+SHA256 (courier-imap-5.3.2.tar.bz2) = 64451cb30705754a0cab3a3f72558154c82dad4ff25c432f2e0f46b03430f68a
+SIZE (courier-imap-5.3.2.tar.bz2) = 3741883
diff --git a/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h b/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h
deleted file mode 100644
index af387f7e7dd7..000000000000
--- a/mail/courier-imap/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/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C
deleted file mode 100644
index 649fadc8ea79..000000000000
--- a/mail/courier-imap/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/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C
deleted file mode 100644
index 353465b17a71..000000000000
--- a/mail/courier-imap/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};