Index: head/security/mbedtls/Makefile
===================================================================
--- head/security/mbedtls/Makefile	(revision 450249)
+++ head/security/mbedtls/Makefile	(revision 450250)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	mbedtls
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6.0
 DISTVERSIONSUFFIX=	-apache
 CATEGORIES=	security devel
 MASTER_SITES=	https://tls.mbed.org/download/
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/apache-2.0.txt
 
 ALL_TARGET=	no_test
 TEST_TARGET=	test
 MAKE_ENV=	SHARED=1
 USES=		gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS_INSTALL=	polarssl13-[0-9]*
 
 post-patch:
 	@${RM} ${WRKSRC}/include/mbedtls/*.orig
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: head/security/mbedtls/distinfo
===================================================================
--- head/security/mbedtls/distinfo	(revision 450249)
+++ head/security/mbedtls/distinfo	(revision 450250)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498696001
-SHA256 (mbedtls-2.5.1-apache.tgz) = 559aeb8c8941262d6aad96a0286a230e7ff988ba53efbf609230ca1f81cc81f9
-SIZE (mbedtls-2.5.1-apache.tgz) = 1955461
+TIMESTAMP = 1505971872
+SHA256 (mbedtls-2.6.0-apache.tgz) = 99bc9d4212d3d885eeb96273bcde8ecc649a481404b8d7ea7bb26397c9909687
+SIZE (mbedtls-2.6.0-apache.tgz) = 1973397
Index: head/security/polarssl13/Makefile
===================================================================
--- head/security/polarssl13/Makefile	(revision 450249)
+++ head/security/polarssl13/Makefile	(revision 450250)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	polarssl
-PORTVERSION=	1.3.20
+PORTVERSION=	1.3.21
 DISTVERSIONSUFFIX=	-gpl
 CATEGORIES=	security devel
 MASTER_SITES=	https://polarssl.org/download/
 PKGNAMESUFFIX=	13
 DISTNAME=	mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ALL_TARGET=	no_test
 MAKE_ENV=	SHARED=1
 USES=		cpe gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS=	polarssl-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: head/security/polarssl13/distinfo
===================================================================
--- head/security/polarssl13/distinfo	(revision 450249)
+++ head/security/polarssl13/distinfo	(revision 450250)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498724294
-SHA256 (mbedtls-1.3.20-gpl.tgz) = 00fc54f9838120cb0c13d07e79417af1f5e89633a0efc8399327e7c2024b666f
-SIZE (mbedtls-1.3.20-gpl.tgz) = 1786284
+TIMESTAMP = 1505971554
+SHA256 (mbedtls-1.3.21-gpl.tgz) = 85ab0ac922e2b254063384fcae8f327acea48079eef8feccd90a4288a9d2ba84
+SIZE (mbedtls-1.3.21-gpl.tgz) = 1802357