diff --git a/databases/postgresql-pllua/Makefile b/databases/postgresql-pllua/Makefile
index 7bbe709618e..98334feaa52 100644
--- a/databases/postgresql-pllua/Makefile
+++ b/databases/postgresql-pllua/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2021/02/10 15:53:11 jeremy Exp $
+# $OpenBSD: Makefile,v 1.18 2021/10/12 18:50:17 sthen Exp $
 
 COMMENT =		Lua procedural language support for PostgreSQL
 
 VERSION =		2.0.7
-DISTNAME =		REL_2_0_7
+GH_ACCOUNT =		pllua
+GH_PROJECT =		pllua
+GH_TAGNAME =		REL_${VERSION:S/./_/g}
 PKGNAME =		postgresql-pllua-${VERSION}
 
 CATEGORIES =		databases
@@ -17,8 +19,6 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c ${MODLUA_WANTLIB}
 
-MASTER_SITES =		https://github.com/pllua/pllua/archive/
-
 MODULES =		lang/lua
 MODLUA_VERSION =	5.3
 
@@ -28,7 +28,6 @@ RUN_DEPENDS =		postgresql-server->=13,<14:databases/postgresql,-server
 
 USE_GMAKE =		Yes
 
-WRKDIST =		${WRKDIR}/pllua-${DISTNAME}
 SUBST_VARS =		MODLUA_INCL_DIR MODLUA_WANTLIB MODLUA_BIN LLD_EMUL
 
 pre-configure:
diff --git a/databases/postgresql-pllua/distinfo b/databases/postgresql-pllua/distinfo
index 1bf18bfa6d8..067ebe3637d 100644
--- a/databases/postgresql-pllua/distinfo
+++ b/databases/postgresql-pllua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (REL_2_0_7.tar.gz) = /7B/Q9s7uGbXTVogC9RZ4gXb9qfRNRRJBncD43KlOv8=
-SIZE (REL_2_0_7.tar.gz) = 216196
+SHA256 (pllua-REL_2_0_7.tar.gz) = /7B/Q9s7uGbXTVogC9RZ4gXb9qfRNRRJBncD43KlOv8=
+SIZE (pllua-REL_2_0_7.tar.gz) = 216196