diff --git a/.gitignore b/.gitignore
index 71033ba..88a99c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+/*.log
+/*.rpm
+/series
+/x86_64/
+/results_neovim/
 /neovim-0.1.7.tar.gz
 /neovim-0.2.0.tar.gz
 /neovim-0.2.1.tar.gz
@@ -26,3 +31,6 @@
 /neovim-0.8.3.tar.gz
 /neovim-0.9.0.tar.gz
 /neovim-0.9.1.tar.gz
+/neovim-0.9.2.tar.gz
+/neovim-0.9.4.tar.gz
+/neovim-0.9.5.tar.gz
diff --git a/neovim-fix-cmake-find-libluv.patch b/neovim-fix-cmake-find-libluv.patch
new file mode 100644
index 0000000..36cfd1d
--- /dev/null
+++ b/neovim-fix-cmake-find-libluv.patch
@@ -0,0 +1,15 @@
+Index: neovim-0.9.4/src/nvim/CMakeLists.txt
+===================================================================
+--- neovim-0.9.4.orig/src/nvim/CMakeLists.txt	2023-10-09 22:38:17.000000000 +0200
++++ neovim-0.9.4/src/nvim/CMakeLists.txt	2023-10-20 22:49:27.287874311 +0200
+@@ -3,8 +3,8 @@ add_executable(nvim main.c)
+ 
+ add_library(libuv INTERFACE)
+ find_package(libuv CONFIG)
+-if(TARGET libuv::uv_a)
+-  target_link_libraries(libuv INTERFACE libuv::uv_a)
++if(TARGET libuv::uv)
++  target_link_libraries(libuv INTERFACE libuv::uv)
+   mark_as_advanced(libuv_DIR)
+ else()
+   # Fall back to find module for older libuv versions that don't provide config file
diff --git a/neovim.spec b/neovim.spec
index 417d2d0..814b7bd 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -5,7 +5,7 @@
 %endif
 
 %bcond_with jemalloc
-%ifarch %{arm} %{ix86} x86_64 %{mips}
+%ifarch %{arm} %{ix86} x86_64 %{mips} s390x
   %bcond_without luajit
 %else
   %ifarch aarch64
@@ -34,8 +34,8 @@
 %endif
 
 Name:           neovim
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        2%{?dist}
 
 License:        Apache-2.0 AND Vim
 Summary:        Vim-fork focused on extensibility and agility
@@ -45,6 +45,8 @@ Source0:        https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v
 Source1:        sysinit.vim
 Source2:        spec-template
 
+Patch0:         neovim-fix-cmake-find-libluv.patch
+
 Patch1000:      neovim-lua-bit32.patch
 
 BuildRequires:  gcc-c++
@@ -69,7 +71,7 @@ Requires:       lua5.1-luv >= %{luv_min_ver}
 # /with luajit
 %endif
 BuildRequires:  lua5.1-lpeg
-BuildRequires:  lua5.1-mpack
+BuildRequires:  lua5.1-mpack >= 1.0.11
 %if %{with jemalloc}
 BuildRequires:  jemalloc-devel
 %endif
@@ -105,6 +107,7 @@ parts of Vim, without compromise, and more.
 %prep
 %setup -q
 
+%patch -P 0 -p1
 %if %{without luajit}
 %patch -P 1000 -p1
 %endif
@@ -562,6 +565,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/css.vim
 %{_datadir}/nvim/runtime/ftplugin/cucumber.vim
 %{_datadir}/nvim/runtime/ftplugin/cvsrc.vim
+%{_datadir}/nvim/runtime/ftplugin/d.lua
 %{_datadir}/nvim/runtime/ftplugin/debchangelog.vim
 %{_datadir}/nvim/runtime/ftplugin/debcontrol.vim
 %{_datadir}/nvim/runtime/ftplugin/denyhosts.vim
@@ -1087,7 +1091,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/lua/vim/_editor.lua
 %{_datadir}/nvim/runtime/lua/vim/_init_packages.lua
 %{_datadir}/nvim/runtime/lua/vim/_inspector.lua
-%{_datadir}/nvim/runtime/lua/vim/_meta.lua
+%{_datadir}/nvim/runtime/lua/vim/_options.lua
 %{_datadir}/nvim/runtime/lua/vim/_watch.lua
 %{_datadir}/nvim/runtime/lua/vim/diagnostic.lua
 %{_datadir}/nvim/runtime/lua/vim/filetype.lua
@@ -1945,6 +1949,28 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
 
 %changelog
+* Mon Mar 04 2024 Andreas Schneider <asn@redhat.com> - 0.9.5-2
+- resolves: #2222911 - Build with luajit on s390x
+
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 0.9.5-1
+- Update to version 0.9.5
+  * https://github.com/neovim/neovim/releases/tag/v0.9.5
+  * For bigger version bump changelog see `:help news`
+  * resolves: rhbz#2256278
+
+* Fri Oct 20 2023 Andreas Schneider <asn@redhat.com> - 0.9.4-1
+- Update to version 0.9.4
+  * https://github.com/neovim/neovim/releases/tag/v0.9.4
+  * For bigger version bump changelog see `:help news`
+  * resolves: rhbz#2243010
+
+* Thu Sep 07 2023 Andreas Schneider <asn@redhat.com> - 0.9.2-1
+- Update to version 0.9.2
+  * For changelog see `:help news`
+
+* Mon Aug 28 2023 LuK1337 <priv.luk@gmail.com> - 0.9.1-4
+- Improve spec template
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 88c3b1a..2846255 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neovim-0.9.1.tar.gz) = 339efd3d8c1a73aa3b43e8770d6943aeba9e4ce6a3598c0424e388f80759d50b14aa7c60fd435bf2d17997476e06d28b79e7e98670d02ca9ceec031841e8b9b8
+SHA512 (neovim-0.9.5.tar.gz) = 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775
diff --git a/spec-template b/spec-template
index 30e6437..cc35793 100644
--- a/spec-template
+++ b/spec-template
@@ -1,6 +1,6 @@
 Name:
 Version:
-Release:        %{autorelease}
+Release:        %autorelease
 Summary:
 
 License:
@@ -35,4 +35,4 @@ Requires:
 
 
 %changelog
-%{autochangelog}
+%autochangelog