diff --git a/www/quark/Makefile b/www/quark/Makefile
index c3533dc68440..6c17d0b973c3 100644
--- a/www/quark/Makefile
+++ b/www/quark/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	quark
-DISTVERSION=	g20190923
-PORTREVISION=	1
+DISTVERSION=	g20210222
 CATEGORIES=	www
-# XXX: See PR 244457 for details why this is not LOCAL/0mp.
-MASTER_SITES=	https://people.freebsd.org/~0mp/distfiles/
 PKGNAMESUFFIX=	-server
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small and simple HTTP GET/HEAD-only web server for static content
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	quark
+USE_GITHUB=	yes
+GH_ACCOUNT=	t6 # mirror of http://git.suckless.org/quark/
+GH_TAGNAME=	68b4f733b2755762e43df90f73db5a6ec8d14104
 
-MAKE_ARGS=	MANPREFIX=${PREFIX}/share/man
+CONFLICTS_INSTALL=	quark
 
 PLIST_FILES=	bin/quark \
 		share/man/man1/quark.1.gz
 
-.include <bsd.port.options.mk>
-
-_COMMIT_HASH=	3c7049e9063edebbd1934178f263f9f3c9b8ddf5
-
 pre-everything::
 	@${ECHO_MSG} "You can build quark with your own config.h using the QUARK_CONF knob:"
 	@${ECHO_MSG} "make QUARK_CONF=/path/to/quark/config.h install clean"
 
-post-patch:
 .if defined(QUARK_CONF)
+post-patch:
 	@${ECHO_MSG} "Creating config.h from ${QUARK_CONF}"
 	@${LN} -sf ${QUARK_CONF} ${WRKSRC}/config.h
 .endif
 
+do-configure:
+	@${ECHO_CMD} PREFIX="${PREFIX}" >>${WRKSRC}/config.mk
+	@${ECHO_CMD} CC="${CC}" >>${WRKSRC}/config.mk
+	@${ECHO_CMD} CFLAGS+="${CFLAGS}" >>${WRKSRC}/config.mk
+	@${ECHO_CMD} LDFLAGS+="${LDFLAGS}" >>${WRKSRC}/config.mk
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quark
 
 .include <bsd.port.mk>
diff --git a/www/quark/distinfo b/www/quark/distinfo
index e977c3bd7c9d..7338247c5d00 100644
--- a/www/quark/distinfo
+++ b/www/quark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571571885
-SHA256 (quark-server-g20190923.tar.gz) = 3c50e52d8e6f8f939cd02e3a94368a22c3f723606b7c486bb30cec8f1dc09b5e
-SIZE (quark-server-g20190923.tar.gz) = 14101
+TIMESTAMP = 1634126831
+SHA256 (t6-quark-g20210222-68b4f733b2755762e43df90f73db5a6ec8d14104_GH0.tar.gz) = 7621e549493867199c461582b4f96c4fb890420b86f692dfd8b58da61dd4da7b
+SIZE (t6-quark-g20210222-68b4f733b2755762e43df90f73db5a6ec8d14104_GH0.tar.gz) = 23529
diff --git a/www/quark/files/patch-Makefile b/www/quark/files/patch-Makefile
deleted file mode 100644
index 7ff5aeb0ae0c..000000000000
--- a/www/quark/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2020-02-26 22:07:21 UTC
-+++ Makefile
-@@ -2,7 +2,7 @@
- # quark - simple web server
- .POSIX:
- 
--include config.mk
-+#include config.mk
- 
- COMPONENTS = util sock http resp
-