diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 62c0f05fd33f..66bf44fd8db2 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,53 +1,52 @@
 PORTNAME=	cone
-DISTVERSION=	1.18
-PORTREVISION=	1
+DISTVERSION=	2.2
 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 aabbe943e9f4..346deb6660ff 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1768244343
-SHA256 (cone-1.18.tar.bz2) = f05c51f70ce7ad48cf433e071a303f9a7ed57c2b986171fbc51821ebeb30475e
-SIZE (cone-1.18.tar.bz2) = 4298978
+TIMESTAMP = 1782642744
+SHA256 (cone-2.2.tar.bz2) = 7725afc88ea3cfc180d3297f83425938a3f22ad252c8db35a5b1e509ecdac6bb
+SIZE (cone-2.2.tar.bz2) = 4341100