diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 72b203433c3c..7e532243b9c0 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2020/05/22 10:55:59 adam Exp $
+# $NetBSD: Makefile,v 1.117 2020/07/26 23:10:21 nia Exp $
 
-DISTNAME=	weechat-2.8
-PKGREVISION=	2
+DISTNAME=	weechat-2.9
 CATEGORIES=	chat
 MASTER_SITES=	https://www.weechat.org/files/src/
 EXTRACT_SUFX=	.tar.xz
@@ -46,11 +45,16 @@ SUBST_FILES.python=	configure.ac cmake/FindPython.cmake
 SUBST_SED.python=	-e 's,python3,python-${PYVERSSUFFIX},g'
 .endif
 
+pre-configure:
+	# Use the standard cmake mechanism for finding Lua.
+	${RM} -f ${WRKSRC}/cmake/FindLua.cmake
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index b52470de1cc9..fb31292dc095 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.62 2020/04/01 14:58:49 nia Exp $
+$NetBSD: distinfo,v 1.63 2020/07/26 23:10:21 nia Exp $
 
-SHA1 (weechat-2.8.tar.xz) = fec7018168f2fa973b1a4d8224fdac8b59617ada
-RMD160 (weechat-2.8.tar.xz) = 6c1453c5b97ba061bc2539033e62eb7f07ee52c8
-SHA512 (weechat-2.8.tar.xz) = 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
-Size (weechat-2.8.tar.xz) = 2248868 bytes
+SHA1 (weechat-2.9.tar.xz) = b977397266e4b586540fd6c4fcf5aaeef24fde67
+RMD160 (weechat-2.9.tar.xz) = 392af28dcbff7b9546b1d4040c7f3e13486fe968
+SHA512 (weechat-2.9.tar.xz) = c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
+Size (weechat-2.9.tar.xz) = 2206584 bytes
 SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4
 SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
 SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f
+SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541
 SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk
index 48af86aea315..32069e981de0 100644
--- a/chat/weechat/options.mk
+++ b/chat/weechat/options.mk
@@ -1,19 +1,15 @@
-# $NetBSD: options.mk,v 1.26 2020/07/04 11:34:59 nia Exp $
+# $NetBSD: options.mk,v 1.27 2020/07/26 23:10:21 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.weechat
 # mk/curses will handle wide-curses
-PKG_SUPPORTED_OPTIONS=	gnutls python lua wide-curses perl ruby
-PKG_SUGGESTED_OPTIONS=	gnutls python lua wide-curses perl ruby
+PKG_SUPPORTED_OPTIONS=	python lua wide-curses perl ruby
+PKG_SUGGESTED_OPTIONS=	python lua wide-curses perl ruby
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.fast.prefs.mk"
 
 PLIST_VARS+=		lua plugin python perl ruby
 
-.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mpython)
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 .include "../../lang/python/extension.mk"
@@ -24,7 +20,7 @@ CMAKE_ARGS+=	-DENABLE_PYTHON=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_ACCEPTED=	53 52 51
+#LUA_VERSIONS_ACCEPTED=	53 52 51
 .include "../../lang/lua/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LUA=ON
 PLIST.lua=	yes
diff --git a/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
new file mode 100644
index 000000000000..fc05b15fd26f
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.1 2020/07/26 23:10:21 nia Exp $
+
+Use the standard variables defined by cmake's own FindLua.
+
+--- src/plugins/lua/CMakeLists.txt.orig	2020-07-18 11:59:02.000000000 +0000
++++ src/plugins/lua/CMakeLists.txt
+@@ -25,8 +25,8 @@ add_library(lua MODULE
+ set_target_properties(lua PROPERTIES PREFIX "")
+ 
+ if(LUA_FOUND)
+-  include_directories(${LUA_INCLUDE_DIRS})
+-  target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
++  include_directories(${LUA_INCLUDE_DIR})
++  target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config)
+ endif()
+ 
+ install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)