diff --git a/mail/smtp-cli/Makefile b/mail/smtp-cli/Makefile
index e97eddf1093c..f885ca273016 100644
--- a/mail/smtp-cli/Makefile
+++ b/mail/smtp-cli/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	smtp-cli
-# Date created:			Thu Apr 22 10:03:56 CEST 2010
-# Whom:				Frank Wall <fw@moov.de>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	smtp
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://www.logix.cz/michal/devel/smtp-cli/
 PKGNAMESUFFIX=	-cli
@@ -15,32 +9,32 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 EXTRACT_SUFX=	-${PORTVERSION}
 
 MAINTAINER=	fw@moov.de
-COMMENT=	A powerful SMTP command line client
+COMMENT=	Powerful SMTP command line client
 
 RUN_DEPENDS=	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-File-Type>0:${PORTSDIR}/devel/p5-File-Type \
+		p5-File-LibMagic>0:${PORTSDIR}/devel/p5-File-LibMagic \
 		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		p5-MIME-Lite>0:${PORTSDIR}/mail/p5-MIME-Lite \
 		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
 
-.if !defined(WITHOUT_IPV6)
-RUN_DEPENDS+=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
-# won't be needed if p5-IO-Socket-SSL > 1.74_1
-.endif
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 PLIST_FILES=	bin/smtp-cli
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIPV6}
+RUN_DEPENDS+=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
+# won't be needed if p5-IO-Socket-SSL > 1.74_1
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKSRC}/
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${DISTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e '1 s|#!/usr/bin/perl|#!${PERL}|' ${WRKSRC}/${DISTNAME}
-#	pr ports/168381, io-socket-ssl > 1.70 rejects 'SSLv3 TLSv1' param.
-	@${REINPLACE_CMD} -e '/SSL_version/s|SSLv3 TLSv1|SSLv23:!SSLv2|' ${WRKSRC}/${DISTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/
diff --git a/mail/smtp-cli/distinfo b/mail/smtp-cli/distinfo
index ba453235e389..c37b0946c573 100644
--- a/mail/smtp-cli/distinfo
+++ b/mail/smtp-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smtp-cli-3.0) = 97a470801bc660ba348863b9e36a4e3d94d09fc37422c75a91c56d288dd6578e
-SIZE (smtp-cli-3.0) = 30002
+SHA256 (smtp-cli-3.3) = 4e56e61ef6dca6524fc1018e674823fcac447784f235500219bbedcc4bbff043
+SIZE (smtp-cli-3.3) = 31673
diff --git a/mail/smtp-cli/pkg-descr b/mail/smtp-cli/pkg-descr
index 9614d447cf35..65089fa84684 100644
--- a/mail/smtp-cli/pkg-descr
+++ b/mail/smtp-cli/pkg-descr
@@ -7,4 +7,4 @@ images. The MIME-Type of the attachments can either be guessed
 automatically or alternatively set on the command line, separately
 for each attachment if required.
 
-WWW:	http://www.logix.cz/michal/devel/smtp-cli/
+WWW: http://www.logix.cz/michal/devel/smtp-cli/