Index: head/security/s2n/Makefile
===================================================================
--- head/security/s2n/Makefile	(revision 433336)
+++ head/security/s2n/Makefile	(revision 433337)
@@ -1,45 +1,45 @@
 # Created by: Danilo Egea Gondolfo <danilo@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	s2n
-PORTVERSION=	20160628
+PORTVERSION=	20170202
 CATEGORIES=	security
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	C99 implementation of the TLS/SSL protocols
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	awslabs
-GH_TAGNAME=	2bae833
+GH_TAGNAME=	c8e42e2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		gmake ssl
 USE_LDCONFIG=	yes
 NO_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message Makefile
 ALL_TARGET=	bin
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|CFLAGS |&+|' ${WRKSRC}/s2n.mk
 	@${REINPLACE_CMD} -e 's|CRYPTO_LDFLAGS |&+|' \
 		${WRKSRC}/tests/testlib/Makefile \
 		${WRKSRC}/tests/unit/Makefile
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/lib/libs2n.so* ${STAGEDIR}${LOCALBASE}/lib
 	${LN} -s libs2n.so ${STAGEDIR}${LOCALBASE}/lib/libs2n.so.0
 	${INSTALL_DATA} ${WRKSRC}/api/s2n* ${STAGEDIR}${LOCALBASE}/include
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -r ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/*.c ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/Makefile ${STAGEDIR}${EXAMPLESDIR}
 
 tests: build
-	${GMAKE} PLATFORM=FreeBSD CRYPTO_LDFLAGS=-L${LOCALBASE}/lib -C ${WRKSRC}/tests
+	${GMAKE} PLATFORM=FreeBSD S2N_DONT_MLOCK=yes \
+		CRYPTO_LDFLAGS=-L${LOCALBASE}/lib -C ${WRKSRC}/tests
 
 .include <bsd.port.mk>
Index: head/security/s2n/distinfo
===================================================================
--- head/security/s2n/distinfo	(revision 433336)
+++ head/security/s2n/distinfo	(revision 433337)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467213207
-SHA256 (awslabs-s2n-20160628-2bae833_GH0.tar.gz) = b10c52a1131caf5c0ea24cd2fe738df4545e0291f1b05af69647a07415f9a774
-SIZE (awslabs-s2n-20160628-2bae833_GH0.tar.gz) = 470790
+TIMESTAMP = 1486141210
+SHA256 (awslabs-s2n-20170202-c8e42e2_GH0.tar.gz) = cb6b8721633cc4040a0b9422249d4ff8aa60ef9f895bf75f7b7326186ae2fd1d
+SIZE (awslabs-s2n-20170202-c8e42e2_GH0.tar.gz) = 565016