diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile
index e4d6fa45d6a1..2b3d6816f9a0 100644
--- a/www/mohawk/Makefile
+++ b/www/mohawk/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	mohawk
-PORTVERSION=	2.0.21
+DISTVERSION=	2.0.21
 CATEGORIES=	www
-MASTER_SITES=	http://fossil.bsdsx.fr/mohawk/tarball/
-DISTFILES=	${DISTNAME}.tar.gz?uuid=${PORTVERSION}
+MASTER_SITES=	https://fossil.bsdsx.fr/mohawk/tarball/?r=${DISTVERSION}&name=/
 
 MAINTAINER=	dsx+mohawk@bsdsx.fr
 COMMENT=	Simple and lightweight HTTP daemon
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-PLIST_FILES+=	bin/mhtpasswd \
+USES=		localbase uidfix
+USE_RC_SUBR=	mohawk
+
+CFLAGS+=	-I${LOCALBASE}/include/event2/compat
+
+PLIST_FILES=	bin/mhtpasswd \
 		man/man5/mohawk.conf.5.gz \
 		man/man8/mhtpasswd.8.gz \
 		man/man8/mohawk.8.gz \
 		sbin/mohawk \
 		etc/mohawk.conf.sample
 
-USES=	uidfix
-
 PORTEXAMPLES=	*
-USE_RC_SUBR=	mohawk
-
-CFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/minimal.conf ${STAGEDIR}${PREFIX}/etc/mohawk.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/mhtpasswd.sh ${STAGEDIR}${PREFIX}/bin/mhtpasswd
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.conf ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/mohawk/distinfo b/www/mohawk/distinfo
index 245a36f57e25..9d5f802a8cb5 100644
--- a/www/mohawk/distinfo
+++ b/www/mohawk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632555938
-SHA256 (mohawk-2.0.21.tar.gz?uuid=2.0.21) = 28270f604ca707d7084e37eb77c1cd07fd3a0846fe5c7f1fb28869cf13b25825
-SIZE (mohawk-2.0.21.tar.gz?uuid=2.0.21) = 44319
+TIMESTAMP = 1632665713
+SHA256 (mohawk-2.0.21.tar.gz) = 92b20038d4f26fbe79e3deb229a065f82e916394e4c42c573b1f9191f5ff1944
+SIZE (mohawk-2.0.21.tar.gz) = 44308
diff --git a/www/mohawk/files/patch-man5__Makefile b/www/mohawk/files/patch-man5__Makefile
index 0da51ff81de4..3dac07424ee4 100644
--- a/www/mohawk/files/patch-man5__Makefile
+++ b/www/mohawk/files/patch-man5__Makefile
@@ -1,7 +1,8 @@
---- ./man5/Makefile.orig	2012-05-28 13:26:48.000000000 +0200
-+++ ./man5/Makefile	2012-05-28 13:27:02.000000000 +0200
-@@ -1,3 +1,4 @@
-+SHAREDIR=	${PREFIX}
+--- man5/Makefile.orig	2021-09-25 06:45:21 UTC
++++ man5/Makefile
+@@ -1,4 +1,5 @@
  MAN= mohawk.conf.5
++SHAREDIR=	${PREFIX}
+ NO_OBJ=
  
  .include <bsd.prog.mk>
diff --git a/www/mohawk/files/patch-man8__Makefile b/www/mohawk/files/patch-man8__Makefile
index e6363babda12..1170f1108b86 100644
--- a/www/mohawk/files/patch-man8__Makefile
+++ b/www/mohawk/files/patch-man8__Makefile
@@ -1,7 +1,8 @@
---- ./man8/Makefile.orig	2012-05-28 13:27:10.000000000 +0200
-+++ ./man8/Makefile	2012-05-28 13:27:22.000000000 +0200
-@@ -1,3 +1,4 @@
+--- man8/Makefile.orig	2021-09-25 06:45:21 UTC
++++ man8/Makefile
+@@ -1,4 +1,5 @@
+ MAN= mhtpasswd.8 mohawk.8
 +SHAREDIR=	${PREFIX}
- MAN8= mhtpasswd.8 mohawk.8
+ NO_OBJ=
  
  .include <bsd.prog.mk>