diff -rupN obhttpd.orig/Makefile obhttpd/Makefile
--- obhttpd.orig/Makefile	2017-02-16 21:43:11.000000000 +0000
+++ obhttpd/Makefile	2017-05-05 08:42:42.780940000 +0000
@@ -1,8 +1,8 @@
-# $FreeBSD: head/www/obhttpd/Makefile 434257 2017-02-16 21:43:11Z jrm $
+# $FreeBSD$
 
 PORTNAME=	obhttpd
 PORTVERSION=	6.0.20161006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	koue@chaosophia.net
@@ -44,8 +44,26 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if empty(SSL_DEFAULT:Mlibressl*)
-IGNORE=		needs LibreSSL to build. Set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything
-.endif
+.if ! ${SSL_DEFAULT:Mlibressl*}
+BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
+
+do-configure:
+	${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
+			${WRKSRC}/usr.sbin/httpd/Makefile
+	${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
+			${WRKSRC}/usr.sbin/httpd/Makefile
+	${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
+			${WRKSRC}/usr.bin/htpasswd/Makefile
+	${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
+			${WRKSRC}/usr.bin/htpasswd/Makefile
+
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+
+pre-configure:
+	@(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
+		. ${WRKDIR}/libressl "! -name *.so*")
+.endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>
diff -rupN obhttpd.orig/files/patch-lib_libtls_tls__conninfo.c obhttpd/files/patch-lib_libtls_tls__conninfo.c
--- obhttpd.orig/files/patch-lib_libtls_tls__conninfo.c	1970-01-01 00:00:00.000000000 +0000
+++ obhttpd/files/patch-lib_libtls_tls__conninfo.c	2017-05-05 08:42:25.621351000 +0000
@@ -0,0 +1,14 @@
+--- lib/libtls/tls_conninfo.c.orig	2017-05-04 18:48:54 UTC
++++ lib/libtls/tls_conninfo.c
+@@ -140,9 +140,9 @@ tls_get_peer_cert_times(struct tls *ctx,
+ 		goto err;
+ 	if ((after = X509_get_notAfter(ctx->ssl_peer_cert)) == NULL)
+ 		goto err;
+-	if (asn1_time_parse(before->data, before->length, &before_tm, 0) == -1)
++	if (ASN1_time_parse(before->data, before->length, &before_tm, 0) == -1)
+ 		goto err;
+-	if (asn1_time_parse(after->data, after->length, &after_tm, 0) == -1)
++	if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1)
+ 		goto err;
+ 	if ((*notbefore = timegm(&before_tm)) == -1)
+ 		goto err;