diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index 73250d2a7a48..70c45e76fb90 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	apachetop
-PORTVERSION=	0.19.7
+DISTVERSION=	0.19.7
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	lukasz@wasikowski.net
 COMMENT=	Apache realtime log stats
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		autoreconf cpe ncurses readline
-USE_GITHUB=	yes
-GH_ACCOUNT=	tessus
+USES=		cpe ncurses readline
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ENV+=	NCURSES_CFLAGS="-I${NCURSESINC}" NCURSES_LIBS="-lncursesw"
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	ADNS FAM PCRE
 
 ADNS_DESC=	Asynchronous-capable DNS support
 ADNS_LIB_DEPENDS=	libadns.so:dns/adns
 ADNS_CONFIGURE_WITH=	adns=${LOCALBASE}
 
 FAM_LIB_DEPENDS=	libfam.so:devel/fam
 FAM_CONFIGURE_WITH=	fam=${LOCALBASE}
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/apachetop/distinfo b/sysutils/apachetop/distinfo
index 2b2bdbec8fcc..00b68e76ab2c 100644
--- a/sysutils/apachetop/distinfo
+++ b/sysutils/apachetop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660754845
-SHA256 (tessus-apachetop-0.19.7_GH0.tar.gz) = 88abf58ee5d7882e4cc3fa2462865ebbf0e8f872fdcec5186abe16e7bff3d4a5
-SIZE (tessus-apachetop-0.19.7_GH0.tar.gz) = 43388
+TIMESTAMP = 1660844272
+SHA256 (apachetop-0.19.7.tar.gz) = 7f0ad1cd11cd1f86052bbfd63f27ecb6cb74012a17321354af70abf05998c4eb
+SIZE (apachetop-0.19.7.tar.gz) = 132665
diff --git a/sysutils/apachetop/files/patch-configure.ac b/sysutils/apachetop/files/patch-configure.ac
deleted file mode 100644
index 72333d188a62..000000000000
--- a/sysutils/apachetop/files/patch-configure.ac
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.ac.orig	2019-07-20 16:29:06.000000000 +0800
-+++ configure.ac	2022-08-18 01:36:23.768371000 +0800
-@@ -36,8 +36,6 @@
- AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE
-
--PKG_PROG_PKG_CONFIG
--
- # Add non-standard directories to the include path
- AC_ARG_WITH(libraries,
-     [
-@@ -135,22 +133,14 @@
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
- 
--NCURSES_FOUND=no
--PKG_CHECK_MODULES(NCURSES, ncurses, [
--		  LIBS="$LIBS $NCURSES_LIBS"
--		  NCURSES_FOUND=yes
--		 ])
--
--AS_IF([test "x$NCURSES_FOUND" != "xyes"], [
--	AC_SEARCH_LIBS([attron], [ncurses])
--	AC_SEARCH_LIBS([tgetstr], [termcap])
--	AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
--	    [] ,
--	    [
--	        AC_MSG_ERROR([No useful curses library found!])
--	    ]
--	)
--])
-+AC_SEARCH_LIBS([attron], [ncurses])
-+AC_SEARCH_LIBS([tgetstr], [termcap])
-+AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
-+               [] ,
-+               [
-+                AC_MSG_ERROR([No useful curses library found!])
-+                ]
-+               )
-
- AC_SEARCH_LIBS([readline], [readline],
-     [