diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 4fbf0f2104b2..cb4d59818ffb 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,90 +1,91 @@
 # Created by: Andreas Kohn
 # $FreeBSD$
 
 PORTNAME=	mercurial
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, lightweight source control management system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=	python:2
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS NLS FREEBSD
 OPTIONS_DEFAULT=DATA
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
 NLS_USES=		gettext
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
 		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
 		hgfixes/__init__.py \
 		hgfixes/fix_bytes.py \
 		hgfixes/fix_bytesmod.py \
 		hgfixes/fix_leftover_imports.py \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mq.el \
 		perf.py \
 		pylintrc \
 		python-hook-examples.py \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 DOCS=		CONTRIBUTORS README
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDATA}
 SUB_FILES=	pkg-message
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so
 .if ${PORT_OPTIONS:MDATA}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgfixes
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgsh
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
 	for f in ${CONTRIB_FILES}; do \
 		${CP} -p ${WRKSRC}/contrib/$${f} ${STAGEDIR}${DATADIR}/contrib/$${f}; \
 	done
 	${MKDIR} ${STAGEDIR}${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/*.cgi ${STAGEDIR}${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${STAGEDIR}${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${STAGEDIR}${DATADIR}/www
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/files/patch-mercurial_sslutil.py b/devel/mercurial/files/patch-mercurial_sslutil.py
new file mode 100644
index 000000000000..81926b1b20e7
--- /dev/null
+++ b/devel/mercurial/files/patch-mercurial_sslutil.py
@@ -0,0 +1,18 @@
+Change condition in order to prevent SSLv2 and SSLv3 protocols.
+Taken from ${PYTHON_LIBDIR}/ssl.py file (found in 'create_default_context'
+function).
+
+--- mercurial/sslutil.py.orig	2015-02-02 02:20:50 UTC
++++ mercurial/sslutil.py
+@@ -29,7 +29,10 @@ try:
+             # maintainers for us, but that breaks too many things to
+             # do it in a hurry.
+             sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+-            sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3
++            # SSLv2 is considered harmful
++            sslcontext.options |= ssl.OP_NO_SSLv2
++            # SSLv3 has problematic security issue
++            sslcontext.options |= ssl.OP_NO_SSLv3
+             if certfile is not None:
+                 sslcontext.load_cert_chain(certfile, keyfile)
+             sslcontext.verify_mode = cert_reqs