diff --git devel/lua-cqueues/Makefile devel/lua-cqueues/Makefile
index b0dfdc22ca77..fdce6de0202b 100644
--- devel/lua-cqueues/Makefile
+++ devel/lua-cqueues/Makefile
@@ -1,30 +1,50 @@
 # Created by: Leo Vandewoestijne <freebsd@dns.company>
 # $FreeBSD$
 
 PORTNAME=	cqueues
 DISTVERSIONPREFIX=	rel-
 DISTVERSION=	20200603
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	freebsd@dns.company
-COMMENT=	Constant queues lib
+COMMENT=	Continuation queues module for Lua
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake lua:51+,module ssl
-USE_LDCONFIG=	{LUA_MODLIBDIR}
-LDFLAGS+=	-Wl,-soname,liblua-${PORTNAME}.so.${LUA_VER_STR}
+USES=		gmake lua:51-53,module ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wahern
 
-SONAME=		${STAGEDIR}${PREFIX}/lib/liblua-${PORTNAME}.so
+MAKE_ENV+=	LUA_APIS="${LUA_VER}"
+CPPFLAGS+=	"-I${LUA_INCDIR}"
+
+DOCSDIR=	${LUA_DOCSDIR}
+EXAMPLESDIR=	${LUA_EXAMPLESDIR}
+PORTDOCS=	cqueues.pdf
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+EXAMPLES_USES=	shebangfix
+EXAMPLES_VARS=	shebang_files="examples/*"
+
+# Some of the shebangs in examples/* are formatted like this.
+lua_OLD_CMD+=	/usr/local/lua[0-9]*/bin/lua
 
 post-install:
-	${MV} ${STAGEDIR}${LUA_MODLIBDIR}/_${PORTNAME}.so ${SONAME}.${LUA_VER_STR}
-	${STRIP_CMD} ${SONAME}.${LUA_VER_STR}
-	${RLN} ${SONAME}.${LUA_VER_STR} ${SONAME}
+	${STRIP_CMD} ${STAGEDIR}${LUA_MODLIBDIR}/_${PORTNAME}.so
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${BUILD_WRKSRC}/doc/cqueues.pdf ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${BUILD_WRKSRC}/examples && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git devel/lua-cqueues/pkg-plist devel/lua-cqueues/pkg-plist
index 8d2d46d65f57..d1f1982ad911 100644
--- devel/lua-cqueues/pkg-plist
+++ devel/lua-cqueues/pkg-plist
@@ -1,20 +1,18 @@
-lib/liblua-cqueues.so.%%LUA_VER_STR%%
-lib/liblua-cqueues.so
+%%LUA_MODLIBDIR%%/_cqueues.so
 %%LUA_MODSHAREDIR%%/cqueues.lua
 %%LUA_MODSHAREDIR%%/cqueues/auxlib.lua
 %%LUA_MODSHAREDIR%%/cqueues/condition.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/config.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/hints.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/hosts.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/packet.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/record.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/resolver.lua
 %%LUA_MODSHAREDIR%%/cqueues/dns/resolvers.lua
 %%LUA_MODSHAREDIR%%/cqueues/errno.lua
 %%LUA_MODSHAREDIR%%/cqueues/notify.lua
 %%LUA_MODSHAREDIR%%/cqueues/promise.lua
 %%LUA_MODSHAREDIR%%/cqueues/signal.lua
 %%LUA_MODSHAREDIR%%/cqueues/socket.lua
 %%LUA_MODSHAREDIR%%/cqueues/thread.lua
-@dir %%LUA_MODLIBDIR%%