diff --git a/gnvim/.footprint b/gnvim/.footprint
index 493301452..52f3fca76 100644
--- a/gnvim/.footprint
+++ b/gnvim/.footprint
@@ -6,15 +6,12 @@ drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/gnvim.desktop
 drwxr-xr-x	root/root	usr/share/gnvim/
 drwxr-xr-x	root/root	usr/share/gnvim/runtime/
-drwxr-xr-x	root/root	usr/share/gnvim/runtime/autoload/
-drwxr-xr-x	root/root	usr/share/gnvim/runtime/autoload/gnvim/
--rw-r--r--	root/root	usr/share/gnvim/runtime/autoload/gnvim/cursor_tooltip.vim
--rw-r--r--	root/root	usr/share/gnvim/runtime/autoload/gnvim/popupmenu.vim
 drwxr-xr-x	root/root	usr/share/gnvim/runtime/doc/
 -rw-r--r--	root/root	usr/share/gnvim/runtime/doc/gnvim.txt
 -rw-r--r--	root/root	usr/share/gnvim/runtime/doc/tags
-drwxr-xr-x	root/root	usr/share/gnvim/runtime/plugin/
--rw-r--r--	root/root	usr/share/gnvim/runtime/plugin/gnvim.vim
+drwxr-xr-x	root/root	usr/share/gnvim/runtime/lua/
+drwxr-xr-x	root/root	usr/share/gnvim/runtime/lua/gnvim/
+-rw-r--r--	root/root	usr/share/gnvim/runtime/lua/gnvim/init.lua
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
diff --git a/gnvim/.signature b/gnvim/.signature
index bbbbfefbf..77c19aa94 100644
--- a/gnvim/.signature
+++ b/gnvim/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF306sbY8n1JF10VDYaOT+3dO/HATx3eErFPHpoSS+S3RcN2SzU93f9WTQg0awul1nfXShg0yw6Xl77ac/0jQxjwM=
-SHA256 (Pkgfile) = 953e30202778f5f63f524b51606617016b2935817aa694f9612e78f02c691905
-SHA256 (.footprint) = 6989f156e9601c420b6d8e5e5788da74b625eb4175e091d36c52f5e3f64ab6a5
-SHA256 (gnvim-0.1.6.tar.gz) = 5cda3422b99114710cee6818cf3616ed0e7f810d38e51dd1861c9c269b9e28d0
+RWSagIOpLGJF3xF1a7PCWTVR4jdiRuwUtjlX2j9/MzztHlCyJf7WP5UJBEu5JrWn42J+zeaFlGc8wmHyoHeh4knCAJxeSkJ1jg4=
+SHA256 (Pkgfile) = d483d8ef9047e2f6289856ca9a62945ed833e98a90ba3eac7c644933a0766ee6
+SHA256 (.footprint) = bddb1881a12c28fb181819a21088d69a756413bdd33274a31ba434928930d045
+SHA256 (gnvim-0.2.0.tar.gz) = abacc674ed142b2c807d21b00a2324b32d9babcec1f25a95446d01e3eb0fa386
diff --git a/gnvim/Pkgfile b/gnvim/Pkgfile
index fa058d76b..0c8253e9c 100644
--- a/gnvim/Pkgfile
+++ b/gnvim/Pkgfile
@@ -1,11 +1,11 @@
 # Description: GUI for neovim, without any web bloat
 # URL: https://github.com/vhakulinen/gnvim
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: gtk3 neovim rust
+# Depends on: gtk4 neovim rust
 # Optional: webkitgtk
 
 name=gnvim
-version=0.1.6
+version=0.2.0
 release=1
 source=(https://github.com/vhakulinen/gnvim/archive/v$version/$name-$version.tar.gz)
 
@@ -16,26 +16,8 @@ build() {
 
   prt-get isinst webkitgtk || PKGMK_GNVIM+=' --no-default-features'
 
-cat <<- EOF > $name-$version/build.rs
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
-
-fn main() {
-  let out_dir = env::var("OUT_DIR").unwrap();
-  let dest_path = Path::new(&out_dir).join("gnvim_version.rs");
-  let mut f = File::create(&dest_path).unwrap();
-  f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
-}
-EOF
-
-  sed \
-    -e s'|/usr/local/share/gnvim/runtime|/usr/share/gnvim/runtime|' \
-    -i $name-$version/src/main.rs
-
-  cargo fetch --manifest-path $name-$version/Cargo.toml --locked
-  cargo build --manifest-path $name-$version/Cargo.toml --release --frozen $PKGMK_GNVIM
-
+  sed -e 's|/usr/local/share/gnvim/runtime|/usr/share/gnvim/runtime|' \
+    -i $name-$version/ui/src/arguments.rs
+  make -C $name-$version build
   make -C $name-$version PREFIX=/usr DESTDIR=$PKG install
 }