diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 62e309a804a5..7167a4f09096 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	htop
 DISTVERSION=	3.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/htop-dev/htop/releases/download/${PORTVERSION}/
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	fd62b7549533e9a0acc3fb6238f1462d380b8618.patch:-p1
@@ -13,14 +14,12 @@ WWW=		https://htop.dev/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf compiler:c11 cpe libtool localbase ncurses pkgconfig \
-		python:build shebangfix
+LIB_DEPENDS=	libunwind.so:devel/libunwind
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	htop-dev
+USES=		compiler:c11 cpe libtool localbase ncurses pkgconfig python:build shebangfix tar:xz
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-unicode
+CONFIGURE_ARGS=	--enable-libunwind --enable-unicode
 
 PLIST_FILES=	bin/htop \
 		man/man1/htop.1.gz \
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index 351b2c31c24c..a3d1774705cf 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1676742794
-SHA256 (htop-dev-htop-3.2.2_GH0.tar.gz) = 3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8
-SIZE (htop-dev-htop-3.2.2_GH0.tar.gz) = 369873
+TIMESTAMP = 1693986676
+SHA256 (htop-3.2.2.tar.xz) = bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8
+SIZE (htop-3.2.2.tar.xz) = 384820
 SHA256 (fd62b7549533e9a0acc3fb6238f1462d380b8618.patch) = 1c1e5a524ab823a1febbbb68503b9ffd6934e24e3f72c1c79baa3a5aad16a8e4
 SIZE (fd62b7549533e9a0acc3fb6238f1462d380b8618.patch) = 884