diff --git a/www/httptunnel/Makefile b/www/httptunnel/Makefile
index a05168a13394..b754c2d3e757 100644
--- a/www/httptunnel/Makefile
+++ b/www/httptunnel/Makefile
@@ -4,19 +4,24 @@ PORTNAME=	httptunnel
 PORTVERSION=	3.3
 PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://www.Awfulhak.org/httptunnel/ \
-		ftp://ftp.nocrew.org/pub/nocrew/unix/ \
-		http://www.nocrew.org/software/httptunnel/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Tunnel a TCP/IP connection through a HTTP/TCP/IP connection
 
+LICENSE=	GPLv2
+
 OPTIONS_DEFINE=	DEBUG
 
+USES=		autoreconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 DEBUG_CONFIGURE_ENABLE=	debug
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	larsbrinkhoff
+GH_PROJECT=	httptunnel
+GH_TAGNAME=	ebe2583
+
 USE_RC_SUBR=	hts htc
 USERS=		httptunnel
 GROUPS=		httptunnel
diff --git a/www/httptunnel/distinfo b/www/httptunnel/distinfo
index a1aca8c358e2..0fa2a50ee8c5 100644
--- a/www/httptunnel/distinfo
+++ b/www/httptunnel/distinfo
@@ -1,2 +1,4 @@
-SHA256 (httptunnel-3.3.tar.gz) = 142f82b204876c2aa90f19193c7ff78d90bb4c2cba99dfd4ef625864aed1c556
-SIZE (httptunnel-3.3.tar.gz) = 262749
+TIMESTAMP = 1652378606
+SHA256 (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = f422c857638c7ce3deee4daa662e480a33be4be80f861b76e73c79a422f435f5
+SHA512 (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = 64df60eb38d53ad4a8c44c6f6f31090e094eb72bb523524af496822707741fade46b4ed10477a14062348d0326b2c38a42c1a0eb4283787f45f364697883a18e
+SIZE (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = 376230
diff --git a/www/httptunnel/pkg-descr b/www/httptunnel/pkg-descr
index f45889704f2a..8aeca858f869 100644
--- a/www/httptunnel/pkg-descr
+++ b/www/httptunnel/pkg-descr
@@ -1,22 +1,14 @@
-httptunnel creates a bidirectional virtual data path tunnelled in HTTP
-requests.  The requests can be sent via an HTTP proxy if so desired.
-
-This can be useful for users behind restrictive firewalls.  If WWW
-access is allowed through an HTTP proxy, it's possible to use
-httptunnel and, say, telnet or PPP to connect to a computer outside
-the firewall.
+httptunnel creates a bidirectional virtual data path tunnelled
+in HTTP requests. The requests can be sent via an HTTP proxy if
+so desired. This can be useful for users behind restrictive
+firewalls. If WWW access is allowed through an HTTP proxy, it's
+possible to use httptunnel and, say, telnet or PPP to connect to
+a computer outside the firewall.
 
 If you still don't understand what this is all about, maybe you
 can find some useful information in the FAQ file.
 
-This program is mostly intended for technically oriented users.
+This program is mostly intended for technically-oriented users.
 They should know what to do.
 
-httptunnel is free software.  See COPYING for terms and conditions.
-If you like it, I would appreciate if you sent a post card to:
-        Lars Brinkhoff
-        Kopmansgatan 2
-        411 13  Goteborg
-        Sweden
-
-WWW: http://www.nocrew.org/software/httptunnel/
+WWW: https://github.com/larsbrinkhoff/httptunnel/