diff --git a/community/neovim/PKGBUILD b/community/neovim/PKGBUILD
index eaf20720a..4a957e8c2 100644
--- a/community/neovim/PKGBUILD
+++ b/community/neovim/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=neovim
 pkgver=0.7.0
-pkgrel=1
+pkgrel=3
 pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs'
 arch=('x86_64')
 url='https://neovim.io'
@@ -16,41 +16,41 @@ backup=('etc/xdg/nvim/sysinit.vim')
 license=('custom:neovim')
 provides=('vim-plugin-runtime')
 depends=('libtermkey' 'libuv' 'msgpack-c' 'unibilium' 'libvterm01' 'luajit' 'libluv' 'tree-sitter')
-makedepends=('cmake' 'ninja' 'lua51-mpack' 'lua51-lpeg' 'gperf')
+makedepends=('cmake' 'ninja' 'lua51-mpack' 'lua51-lpeg' 'gperf' 'patchelf')
 optdepends=('python-neovim: for Python 3 plugin support (see :help python)'
             'xclip: for clipboard support on X11 (or xsel) (see :help clipboard)'
             'xsel: for clipboard support on X11 (or xclip) (see :help clipboard)'
             'wl-clipboard: for clipboard support on wayland (see :help clipboard)')
+options=(debug)
 source=("https://github.com/neovim/neovim/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha512sums=('3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0')
 
 build() {
-  cd neovim-${pkgver}
+  export PKG_CONFIG_PATH="/usr/lib/libvterm01/pkgconfig:$PKG_CONFIG_PATH"
   cmake \
     -Bbuild \
     -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DUSE_BUNDLED=OFF \
-    -DENABLE_LTO=OFF
-  cmake --build build
+    -DENABLE_LTO=OFF \
+    -W no-dev \
+    -S neovim-$pkgver
+  cmake --build build --verbose
 }
 
 check() {
-  cd neovim-${pkgver}/build
-  ./bin/nvim --version
-  ./bin/nvim --headless -u NONE -i NONE -c ':quit'
+  ./build/bin/nvim --version
+  ./build/bin/nvim --headless -u NONE -i NONE -c ':quit'
 }
 
 package() {
-  cd neovim-${pkgver}
-  DESTDIR="${pkgdir}" cmake --install build
+  DESTDIR="$pkgdir" cmake --install build
 
-  cd "${srcdir}/neovim-${pkgver}"
-  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-  install -Dm644 runtime/nvim.desktop "${pkgdir}/usr/share/applications/nvim.desktop"
-  install -Dm644 runtime/nvim.appdata.xml "${pkgdir}/usr/share/metainfo/nvim.appdata.xml"
-  install -Dm644 runtime/nvim.png "${pkgdir}/usr/share/pixmaps/nvim.png"
+  install -Dm644 neovim-$pkgver/LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm644 neovim-$pkgver/runtime/nvim.desktop -t "${pkgdir}/usr/share/applications/"
+  install -Dm644 neovim-$pkgver/runtime/nvim.appdata.xml -t "${pkgdir}/usr/share/metainfo/"
+  install -Dm644 neovim-$pkgver/runtime/nvim.png -t "${pkgdir}/usr/share/pixmaps/"
 
   # Make Arch vim packages work
   mkdir -p "${pkgdir}"/etc/xdg/nvim
@@ -59,6 +59,10 @@ package() {
 
   mkdir -p "${pkgdir}"/usr/share/vim
   echo "set runtimepath+=/usr/share/vim/vimfiles" > "${pkgdir}"/usr/share/nvim/archlinux.vim
+
+  # NOTE: this is very ugly and needs to be removed as soon as neovim supports libvterm >= 0.2.0
+  # (both libvterm01 and libvterm provide libvterm.so.0)
+  patchelf --add-rpath '/usr/lib/libvterm01' "$pkgdir/usr/bin/nvim"
 }
 
 # vim:set ft=sh sw=2 sts=2 et: