diff --git a/zlua/Makefile b/zlua/Makefile
index 4958154b05..a47cf1093c 100644
--- a/zlua/Makefile
+++ b/zlua/Makefile
@@ -1,15 +1,14 @@
 # $NetBSD$
 
-DISTNAME=	z.lua-0.0.0.20190131
+DISTNAME=	z.lua-1.8.4
 PKGNAME=	${DISTNAME:S/z.lua/zlua/}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GITHUB:=skywind3000/}
 GITHUB_PROJECT=	z.lua
-GITHUB_TAG=	9fe0fc67a002ce122b10e85e047ef136a4544096
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/skywind3000/z.lua
-COMMENT=	Tool that lets you quickly jump around your filesystem
+COMMENT=	Lightweight tool that lets you quickly jump around your filesystem
 LICENSE=	mit
 
 NO_BUILD=	yes
@@ -25,7 +24,9 @@ INSTALLATION_DIRS+=		share/doc/${PKGBASE}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/z.lua ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/omz.plugin.zsh ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/z.lua.plugin.zsh ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/init.fish ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/ranger_zlua.py ${DESTDIR}${PREFIX}/share/${PKGBASE} # Doesn't include Python hashbang at top
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README.cn.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
diff --git a/zlua/PLIST b/zlua/PLIST
index 3dd84b90c9..1289bfeeed 100644
--- a/zlua/PLIST
+++ b/zlua/PLIST
@@ -2,5 +2,7 @@
 bin/z.lua
 share/doc/zlua/README.cn.md
 share/doc/zlua/README.md
-share/zlua/omz.plugin.zsh
+share/zlua/init.fish
+share/zlua/ranger_zlua.py
 share/zlua/z.cmd
+share/zlua/z.lua.plugin.zsh
diff --git a/zlua/TODO b/zlua/TODO
index 01f9079e74..37ed80dadb 100644
--- a/zlua/TODO
+++ b/zlua/TODO
@@ -3,5 +3,8 @@
   Using this name for now, until we can evaluate
   whether such a name will play nice with pkgsrc.
 
-- Figure out a better places to install z.lua.plugin.zsh
-  for zsh users.
+- There's also an images/ dir referenced by README.md, which
+  we may want to include.
+
+- See if there's a way to replace the `lua' statement in the eval
+  in MESSAGE with the selected version of lua (eg, lua52 or lua53).
diff --git a/zlua/distinfo b/zlua/distinfo
index 525cc3a033..f39b0b02e9 100644
--- a/zlua/distinfo
+++ b/zlua/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (z.lua-0.0.0.20190131-9fe0fc67a002ce122b10e85e047ef136a4544096.tar.gz) = ac9a16aaf5c3c15f5eedb980a27b3512e603c6c5
-RMD160 (z.lua-0.0.0.20190131-9fe0fc67a002ce122b10e85e047ef136a4544096.tar.gz) = f559bb7ac7140a7a497edf186e0edd6563fba2b7
-SHA512 (z.lua-0.0.0.20190131-9fe0fc67a002ce122b10e85e047ef136a4544096.tar.gz) = adf212cdfa0c142cef01c9fd712b66332e33bf2596426b2577a90b728c0e2f357c7ce2b954352d908d0e2516805ccbbaf2e6fec10463602ac6df9f2efb5685ad
-Size (z.lua-0.0.0.20190131-9fe0fc67a002ce122b10e85e047ef136a4544096.tar.gz) = 20478 bytes
+SHA1 (z.lua-1.8.4.tar.gz) = da6ec2936e04331fe98df8945e2612208d913681
+RMD160 (z.lua-1.8.4.tar.gz) = f2c89c118241d6f21f4d5ce8c04cd8b1c5b56c23
+SHA512 (z.lua-1.8.4.tar.gz) = dc9fd04fabbd5b6d47b3919021027ae8fddc62f85950c402ad12599f68cba8f59a924065b356febeed7384860fca334dd5f23c4b3a036b23a20a9a2cfd9b8366
+Size (z.lua-1.8.4.tar.gz) = 193289 bytes