diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile
index 304ad16bd43c..d2caac235cae 100644
--- a/www/obhttpd/Makefile
+++ b/www/obhttpd/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	obhttpd
-PORTVERSION=	6.9.20210510
+PORTVERSION=	7.0.20211108
 CATEGORIES=	www
 MASTER_SITES=	OPENBSD/LibreSSL:libressl
 DISTFILES=	libressl-${SSL}.tar.gz:libressl
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	OpenBSD http server
 
 LICENSE=	BSD3CLAUSE
 
 USES=		uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue
 GH_PROJECT=	httpd \
 		libevent:libevent \
 		libimsg:libimsg
 GH_TAGNAME=	${LIBIMSG}:libimsg \
 		${LIBEVENT}:libevent
 
 USE_RC_SUBR=	obhttpd
 
 MAKE_ARGS+=	MANDIR=${PREFIX}/man/man
 
 # XXX Static libraries with PIE are currently unsupported.
 MAKE_ARGS+=	WITHOUT_PIE=true
 
 CFLAGS+=	-Wall -fcommon \
 		-I${WRKDIR}/libressl-${SSL}/include \
 		-I${WRKSRC_libimsg}/src/lib/libutil \
 		-I${WRKSRC_libevent}/src/lib/libevent
 
 LDFLAGS+=	-L${WRKSRC_libimsg}/src/lib/libutil \
 		-L${WRKSRC_libevent}/src/lib/libevent
 
 USERS=		www
 GROUPS=		www
 
-SSL=		3.3.3
+SSL=		3.4.1
 LIBEVENT=	6.6.20191030
 LIBIMSG=	6.9.20210510
 
 post-patch:
 	${REINPLACE_CMD} -e 's|libimsg/src||g' \
 			 -e 's|libevent||g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|httpd$$|obhttpd|g' \
 			 -e 's|httpd.conf.5|obhttpd.conf.5|g' \
 			 -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/src/usr.sbin/httpd/Makefile
 	${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \
 			 -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/src/usr.bin/htpasswd/Makefile
 	${MV} ${WRKSRC}/src/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/src/usr.bin/htpasswd/obhtpasswd.1
 	${MV} ${WRKSRC}/src/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/src/usr.sbin/httpd/obhttpd.conf.5
 	${MV} ${WRKSRC}/src/usr.sbin/httpd/httpd.8 ${WRKSRC}/src/usr.sbin/httpd/obhttpd.8
 	${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \
 		${WRKSRC}/src/usr.sbin/httpd/httpd.h
 
 pre-configure:
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL}.tar.gz ${EXTRACT_AFTER_ARGS})
 	@(${PATCH} -d ${WRKDIR}/libressl-${SSL} < ${PATCHDIR}/extra-patch-libressl_tls_tls.c)
 	@(cd ${WRKDIR}/libressl-${SSL} && ${SETENV} ./configure && ${SETENV} ${MAKE_ENV} ${MAKE})
 	@(cd ${WRKSRC_libimsg} && ${SETENV} ${MAKE_ENV} ${MAKE})
 	@(cd ${WRKSRC_libevent} && ${SETENV} ${MAKE_ENV} ${MAKE})
 
 post-configure:
 	${REINPLACE_CMD} 's|-ltls|${WRKDIR}/libressl-${SSL}/tls/.libs/libtls.a|g' \
 		${WRKSRC}/src/usr.sbin/httpd/Makefile
 	${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL}/ssl/.libs/libssl.a|g' \
 		 ${WRKSRC}/src/usr.sbin/httpd/Makefile
 	${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL}/crypto/.libs/libcrypto.a|g' \
 		${WRKSRC}/src/usr.sbin/httpd/Makefile
 	${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL}/crypto/.libs/libcrypto.a|g' \
 		${WRKSRC}/src/usr.bin/htpasswd/Makefile
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/etc/examples/httpd.conf \
 		${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
 
 .include <bsd.port.mk>
diff --git a/www/obhttpd/distinfo b/www/obhttpd/distinfo
index 9c38c4972944..dd8b57d98119 100644
--- a/www/obhttpd/distinfo
+++ b/www/obhttpd/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1620680257
-SHA256 (libressl-3.3.3.tar.gz) = a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
-SIZE (libressl-3.3.3.tar.gz) = 3848064
-SHA256 (koue-httpd-6.9.20210510_GH0.tar.gz) = 864b2cb2f5097bd64b1ce01b196d750523f43c6ca4e94bc1b6495410786a2829
-SIZE (koue-httpd-6.9.20210510_GH0.tar.gz) = 168270
+TIMESTAMP = 1636430215
+SHA256 (libressl-3.4.1.tar.gz) = 107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c
+SIZE (libressl-3.4.1.tar.gz) = 3917346
+SHA256 (koue-httpd-7.0.20211108_GH0.tar.gz) = 7b382eb9f7e46f523323eb1980988b14742797acf16ce794da29271ff6ab04fb
+SIZE (koue-httpd-7.0.20211108_GH0.tar.gz) = 172022
 SHA256 (koue-libevent-6.6.20191030_GH0.tar.gz) = 20ae6a4eb59875a3550d7a63edb6b082caf04920fa2a52df6755a5da5af5303e
 SIZE (koue-libevent-6.6.20191030_GH0.tar.gz) = 67565
 SHA256 (koue-libimsg-6.9.20210510_GH0.tar.gz) = 0e93eeb5a167ee4d80ed5f4d53923ae5de9be9742ac1ef1cac3973fad2a3cd26
 SIZE (koue-libimsg-6.9.20210510_GH0.tar.gz) = 15767
diff --git a/www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile b/www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile
deleted file mode 100644
index b5b6f16f190b..000000000000
--- a/www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/usr.bin/htpasswd/Makefile.orig	2018-07-10 10:58:14 UTC
-+++ src/usr.bin/htpasswd/Makefile
-@@ -1,5 +1,6 @@
- #	$OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $
- LOCALBASE?=	/usr/local
-+BINDIR?=	${LOCALBASE}/bin
- 
- PROG=		htpasswd
- SRCS=		htpasswd.c
diff --git a/www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile b/www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile
deleted file mode 100644
index 96fc0028ee8f..000000000000
--- a/www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/usr.sbin/httpd/Makefile.orig	2018-07-10 10:58:32 UTC
-+++ src/usr.sbin/httpd/Makefile
-@@ -1,6 +1,7 @@
- #	$OpenBSD: Makefile,v 1.30 2017/07/03 22:21:47 espie Exp $
- 
- LOCALBASE?=	/usr/local
-+BINDIR?=	${LOCALBASE}/sbin
- PROG=		httpd
- SRCS=		parse.y
- SRCS+=		config.c control.c httpd.c log.c logger.c proc.c getdtablecount.c