diff --git a/net/twirssi/Makefile b/net/twirssi/Makefile
index 5cf9646ad27..7519f5c7e31 100644
--- a/net/twirssi/Makefile
+++ b/net/twirssi/Makefile
@@ -1,22 +1,22 @@
 COMMENT=	Twitter script for irssi
 
-V=		2.6.3
+V=		2.8.0pl20190726
 DISTNAME=	twirssi-$V
-REVISION=	2
 CATEGORIES=	net
 
-HOMEPAGE=	http://www.twirssi.com/
+HOMEPAGE=	https://www.twirssi.com/
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	http://nerd.hu/distfiles/
-EXTRACT_ONLY=
-EXTRACT_SUFX=	.pl
+GH_ACCOUNT =	gedge
+GH_PROJECT =	twirssi
+GH_COMMIT =	630a7019777911054e00dcc6b1ecb66dc1fed318
 
 RUN_DEPENDS=	converters/p5-JSON-Any \
 		net/irssi \
 		net/p5-Net-Twitter \
+		net/p5-Twitter-API \
 		www/p5-LWP-Protocol-https \
 		www/p5-WWW-Shorten
 
@@ -29,7 +29,7 @@ SUBST_VARS=		SCRIPT_DATA_DIR
 
 do-install:
 	${INSTALL_DATA_DIR} ${SCRIPT_DATA_DIR}
-	${INSTALL_SCRIPT} ${FULLDISTDIR}/twirssi-$V.pl \
+	${INSTALL_SCRIPT} ${WRKSRC}/twirssi.pl \
 		${SCRIPT_DATA_DIR}/twirssi.pl
 
 .include <bsd.port.mk>
diff --git a/net/twirssi/distinfo b/net/twirssi/distinfo
index 0e37ab4dfa0..f869eeb4ae3 100644
--- a/net/twirssi/distinfo
+++ b/net/twirssi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (twirssi-2.6.3.pl) = Az2x9CksB5QOIZNEUoQa+gpc6wIEBEtnOLlZehDShvU=
-SIZE (twirssi-2.6.3.pl) = 143169
+SHA256 (twirssi-2.8.0pl20190726-630a7019.tar.gz) = bs7nFv6awTdkGhXrIuhi/ho+ifN+niLL7P8Gbm7PrOw=
+SIZE (twirssi-2.8.0pl20190726-630a7019.tar.gz) = 85980
diff --git a/net/twirssi/pkg/README b/net/twirssi/pkg/README
index 7de7123b698..47879f8345c 100644
--- a/net/twirssi/pkg/README
+++ b/net/twirssi/pkg/README
@@ -17,4 +17,4 @@ following commands from an irssi(1) window:
     /set twitter_passwords <yourpassword>
 
 More information is available at:
-    http://www.twirssi.com/?using
+    https://www.twirssi.com/?using