diff --git a/www/websocketd/Makefile b/www/websocketd/Makefile
index c352d440a5c1..cbd1518b75d5 100644
--- a/www/websocketd/Makefile
+++ b/www/websocketd/Makefile
@@ -2,25 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	websocketd
-DISTVERSION=	0.3.0
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.3.1
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/joewalnes/${PORTNAME}/releases/download/v${DISTVERSION}/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-freebsd_${ARCH:S/i386/386/:S/x86_64/amd64/}
 
 MAINTAINER=	ygy@FreeBSD.org
 COMMENT=	Access any command-line tool via a WebSocket
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS= amd64 i386
+USES=		go:modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	joewalnes
+GH_TUPLE=	gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket
 
-NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_BUILD=	yes
-USES=		zip
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/www/websocketd/distinfo b/www/websocketd/distinfo
index 29a6bf374d0a..60c6326aa18e 100644
--- a/www/websocketd/distinfo
+++ b/www/websocketd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1521782495
-SHA256 (websocketd-0.3.0-freebsd_amd64.zip) = 89e3c0b007a643c870c6b59eecb611cb0757780fcabe402bbb6cbb190ab478be
-SIZE (websocketd-0.3.0-freebsd_amd64.zip) = 2555193
-SHA256 (websocketd-0.3.0-freebsd_386.zip) = b5de6e70273ba0be28b9ee3c76491f6502045def69c8acdf0db5142502439f1e
-SIZE (websocketd-0.3.0-freebsd_386.zip) = 2404543
+TIMESTAMP = 1585363513
+SHA256 (joewalnes-websocketd-v0.3.1_GH0.tar.gz) = 323700908ca7fe7b69cb2cc492b4746c4cd3449e49fbab15a4b3a5eccf8757f4
+SIZE (joewalnes-websocketd-v0.3.1_GH0.tar.gz) = 44833
+SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d
+SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228