diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile
index 5865e973b54d..91711aa01dea 100644
--- a/devel/lua-gettext/Makefile
+++ b/devel/lua-gettext/Makefile
@@ -1,37 +1,38 @@
 # Created by: Andrew Turner <andrew+ports@fubar.geek.nz>
 
 PORTNAME=	gettext
-PORTVERSION=	1.5
-PORTREVISION=	4
+DISTVERSION=	1.6
 CATEGORIES=	devel
-MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/gettext/ \
-		https://BSDforge.com/projects/source/devel/lua-gettext/
-PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
-DISTFILES=	lua_gettext.c gettext.lua
-DIST_SUBDIR=	lua-${PORTNAME}-${COMMIT}
 
 MAINTAINER=	portmaster@BSDforge.com
-COMMENT=	Gettext binding for Lua 5
+COMMENT=	Lua 5+ bindings for Gettext
 
-USES=		gettext lua:51,module
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CVER=		1.15
-LVER=		${PORTVERSION}
-COMMIT=		8323bb9
+USES=		gettext lua:51,module
+USE_GITLAB=	yes
+GL_ACCOUNT=	ports1
+GL_PROJECT=	lua-gettext
+GL_COMMIT=	abd88932fc6e69b8955921bd0682b11db3102eca
 
-PLIST_FILES=	%%LUA_MODSHAREDIR%%/gettext.lua \
-		%%LUA_MODLIBDIR%%/lgettext.so
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV+=	VPATH=${_DISTDIR}
-NO_WRKSUBDIR=	yes
-
-do-extract:
-	# Bulding straight from ${_DISTDIR}
+DOCS=	README README.md CHANGELOG
+DOCSDIR=	${PREFIX}/share/doc/lua-${PORTNAME}
+PLIST_FILES=	%%LUA_MODLIBDIR%%/lgettext.so \
+		%%LUA_MODSHAREDIR%%/gettext.lua \
+		%%DOCSDIR%%/README \
+		%%DOCSDIR%%/README.md \
+		%%DOCSDIR%%/CHANGELOG
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}
-	${INSTALL_DATA} ${_DISTDIR}/gettext.lua ${STAGEDIR}${LUA_MODSHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${STAGEDIR}${LUA_MODSHAREDIR}
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${STAGEDIR}${LUA_MODLIBDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${DOCS}
+	${CP} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/lua-gettext/distinfo b/devel/lua-gettext/distinfo
index c75fb16c19e5..7c86f372328f 100644
--- a/devel/lua-gettext/distinfo
+++ b/devel/lua-gettext/distinfo
@@ -1,4 +1,4 @@
-SHA256 (lua-gettext-8323bb9/lua_gettext.c) = c3ba6db0e0220f2789d06099ce28372b5a30234ffee78caf5fa47efdf274baaf
-SIZE (lua-gettext-8323bb9/lua_gettext.c) = 1429
-SHA256 (lua-gettext-8323bb9/gettext.lua) = a861d10a6aba7d0949c0851fff4d42a494bfaffbcc93a163ec85cecb38309fe3
-SIZE (lua-gettext-8323bb9/gettext.lua) = 315
+TIMESTAMP = 1623275897
+SHA256 (ports1-lua-gettext-abd88932fc6e69b8955921bd0682b11db3102eca_GL0.tar.gz) = 1892d2a7eff26ec1d9a00d0272f6a29ac9bb3bb965f9e4190882cb8f1a70b894
+SHA512 (ports1-lua-gettext-abd88932fc6e69b8955921bd0682b11db3102eca_GL0.tar.gz) = 1776f40844febd3d38420451a6d8fd8cc9d1fba11e43f0e3eb225ae9e837175b15bc6b9d6d51a82c5a967f84310b282da8fae03b96515834489637b3d9bae547
+SIZE (ports1-lua-gettext-abd88932fc6e69b8955921bd0682b11db3102eca_GL0.tar.gz) = 2040
diff --git a/devel/lua-gettext/pkg-descr b/devel/lua-gettext/pkg-descr
index 479088a53b59..685793b64ff4 100644
--- a/devel/lua-gettext/pkg-descr
+++ b/devel/lua-gettext/pkg-descr
@@ -1 +1,3 @@
-Lua bindings for Gettext
+Lua 5x bindings for Gettext
+
+WWW:	https://gitlab.com/ports1/lua-gettext