diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile
index 949d31dfbd09..5f3f3723527b 100644
--- a/devel/lua-language-server/Makefile
+++ b/devel/lua-language-server/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	lua-language-server
-DISTVERSION=	3.6.10
+DISTVERSION=	3.6.9
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
-COMMENT=	Sumneko Lua development server and LSP client
-WWW=		https://github.com/sumneko/lua-language-server
+COMMENT=	Lua development server and LSP client
+WWW=		https://github.com/luals/lua-language-server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		compiler:features dos2unix lua:build ninja:make
 USE_GITHUB=	yes
-GH_ACCOUNT=	sumneko
-GH_TUPLE=	actboy168:bee.lua:eefd184:bee/3rd/bee.lua \
+GH_ACCOUNT=	luals
+GH_TUPLE=	actboy168:bee.lua:c4e989a:bee/3rd/bee.lua \
 		actboy168:bee.lua:eff9325:bee_luamake/3rd/luamake/3rd/bee.lua \
-		actboy168:json.lua:be1d71f:json/3rd/json.lua \
+		actboy168:json.lua:b5f5e7b:json/3rd/json.lua \
 		actboy168:luamake:3d8d1fd:luamake/3rd/luamake \
-		cppcxy:EmmyLuaCodeStyle:9697aa8:emmyluacodestyle/3rd/EmmyLuaCodeStyle \
-		bjornbytes:lovr-docs:9d1c384:lovr/3rd/lovr-api \
+		cppcxy:EmmyLuaCodeStyle:66eeece:emmyluacodestyle/3rd/EmmyLuaCodeStyle \
+		bjornbytes:lovr-docs:8900d79:lovr/3rd/lovr-api \
 		love2d-community:love-api:495ecc7:love/3rd/love-api \
 		sqmedeiros:lpeglabel:e25eb35:lpeglabel/3rd/lpeglabel
 
 BINARY_ALIAS=	gcc=${CC}
 DOS2UNIX_FILES=	3rd/bee.lua/bee/thread/spinlock.h \
 		3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h
 SUB_FILES=	lua-language-server
 PLIST_FILES=	bin/lua-language-server \
 		${DATADIR_REL}/bin/lua-language-server \
 		${DATADIR_REL}/bin/main.lua \
 		${DATADIR_REL}/debugger.lua \
 		${DATADIR_REL}/main.lua
 PORTDATA=	locale meta script
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
 BUILD_DEPENDS+=	llvm13>0:devel/llvm13
 CPP=		${LOCALBASE}/bin/clang-cpp13
 CC=		${LOCALBASE}/bin/clang13
 CXX=		${LOCALBASE}/bin/clang++13
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja \
 		${WRKSRC}/3rd/bee.lua/compile/common.lua
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/3rd/luamake -f compile/ninja/freebsd.ninja
 	cd ${WRKSRC} && ${MAKE_ENV} ./3rd/luamake/luamake -v
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/lua-language-server ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lua-language-server ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/main.lua ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_DATA} ${WRKSRC}/debugger.lua ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/main.lua ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "locale meta script" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/lua-language-server/distinfo b/devel/lua-language-server/distinfo
index 43cd79cf67d8..2fd62adc3c20 100644
--- a/devel/lua-language-server/distinfo
+++ b/devel/lua-language-server/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1675729118
-SHA256 (sumneko-lua-language-server-3.6.10_GH0.tar.gz) = 56dba89d1dec71ae4a7ab7852d260c799e6f56a9c57bb450ac53a4c374597559
-SIZE (sumneko-lua-language-server-3.6.10_GH0.tar.gz) = 3295096
-SHA256 (actboy168-bee.lua-eefd184_GH0.tar.gz) = 455df23c858b1cfada272ec24f7df66d8c8fdc22f5ef578f06fc0c6b4a626f3b
-SIZE (actboy168-bee.lua-eefd184_GH0.tar.gz) = 481786
+TIMESTAMP = 1676212670
+SHA256 (luals-lua-language-server-3.6.9_GH0.tar.gz) = 6e291e769184cabeb4a42969eaa80cf42fbfeb79e3731ce016209946f1aeafcd
+SIZE (luals-lua-language-server-3.6.9_GH0.tar.gz) = 3293832
+SHA256 (actboy168-bee.lua-c4e989a_GH0.tar.gz) = 801cf72c57960293507d2fabe7b3686c9a1343977475cd0ddf72c6b7d841d663
+SIZE (actboy168-bee.lua-c4e989a_GH0.tar.gz) = 480401
 SHA256 (actboy168-bee.lua-eff9325_GH0.tar.gz) = 7c139b1b318a652f41414c677061ddf76e7ed723ca52bb73b83071568e43b229
 SIZE (actboy168-bee.lua-eff9325_GH0.tar.gz) = 480307
-SHA256 (actboy168-json.lua-be1d71f_GH0.tar.gz) = 62a977ab7b63e8d6a3fbdffcc1766507e180be0483b9b9bf50a26889ee706aa8
-SIZE (actboy168-json.lua-be1d71f_GH0.tar.gz) = 26537
+SHA256 (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = ee05dd78a08105d2599c6c100c71301bde20633938a4c198495183bfb305910b
+SIZE (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = 12660
 SHA256 (actboy168-luamake-3d8d1fd_GH0.tar.gz) = 9166d4b6812e582b4a594780a62a99bb068e605980c4fea07811bb4ce519be49
 SIZE (actboy168-luamake-3d8d1fd_GH0.tar.gz) = 56409
-SHA256 (cppcxy-EmmyLuaCodeStyle-9697aa8_GH0.tar.gz) = 727dc5d7599cfc1df65e6a74c079e8057942b5ddc128f95d70e5dab4d05d5c2c
-SIZE (cppcxy-EmmyLuaCodeStyle-9697aa8_GH0.tar.gz) = 4922672
-SHA256 (bjornbytes-lovr-docs-9d1c384_GH0.tar.gz) = 27f030fe1c8db6972f1916e1aaf89c3711d6b835aa490ac776baed759b05d565
-SIZE (bjornbytes-lovr-docs-9d1c384_GH0.tar.gz) = 18070926
+SHA256 (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4b16eefc26dc70d124d14aef45bb7b6cb828ab6dd0228a4a365b4fac4487e598
+SIZE (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4243029
+SHA256 (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 33b6ab2ec5dd7d26733bf2757d3a2b382174fbea2f18a06159ef753944c88239
+SIZE (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 18070542
 SHA256 (love2d-community-love-api-495ecc7_GH0.tar.gz) = 9d63ae5a7a180d2f8db6bc52407900089c15e00b64e0cda65309e548369d06c2
 SIZE (love2d-community-love-api-495ecc7_GH0.tar.gz) = 152170
 SHA256 (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 07b7771490d7dbd2a5aedc165e01bc4a33ef0e0b2e274182f20ac212a98c0620
 SIZE (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 83005