diff --git a/.gitignore b/.gitignore
index 15efb93..581a14b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 /neovim-0.4.3.tar.gz
 /neovim-0.4.4.tar.gz
 /neovim-0.5.0.tar.gz
+/neovim-0.5.1.tar.gz
+/neovim-0.6.0.tar.gz
+/neovim-0.6.1.tar.gz
diff --git a/neovim-libvterm-0-2-support.patch b/neovim-libvterm-0-2-support.patch
new file mode 100644
index 0000000..39e75b0
--- /dev/null
+++ b/neovim-libvterm-0-2-support.patch
@@ -0,0 +1,16 @@
+Index: neovim-0.6.1/src/nvim/terminal.c
+===================================================================
+--- neovim-0.6.1.orig/src/nvim/terminal.c	2021-12-31 18:02:21.000000000 +0100
++++ neovim-0.6.1/src/nvim/terminal.c	2022-01-01 07:16:58.142880441 +0100
+@@ -844,7 +844,11 @@ static int term_settermprop(VTermProp pr
+ 
+   case VTERM_PROP_TITLE: {
+     buf_T *buf = handle_get_buffer(term->buf_handle);
++#if VTERM_VERSION_MAJOR > 0 || (VTERM_VERSION_MAJOR == 0 && VTERM_VERSION_MINOR >= 2)
++    buf_set_term_title(buf, val->string.str);
++#else
+     buf_set_term_title(buf, val->string);
++#endif
+     break;
+   }
+ 
diff --git a/neovim.spec b/neovim.spec
index 157b5c5..34b5446 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,11 +1,11 @@
 %bcond_with jemalloc
-%ifarch %{arm} %{ix86} x86_64 %{mips}
+%ifarch %{arm} %{ix86} x86_64 %{mips} aarch64
 %bcond_without luajit
 %else
 %bcond_with luajit
 %endif
 
-%global luv_min_ver 1.41.0
+%global luv_min_ver 1.42.0
 
 %if %{with luajit}
 %global luajit_version 2.1
@@ -22,8 +22,8 @@
 %endif
 
 Name:           neovim
-Version:        0.5.0
-Release:        5%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 
 License:        ASL 2.0
 Summary:        Vim-fork focused on extensibility and agility
@@ -33,6 +33,8 @@ Source0:        https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v
 Source1:        sysinit.vim
 Source2:        spec-template
 
+Patch0:         neovim-libvterm-0-2-support.patch
+
 Patch1000:      neovim-lua-bit32.patch
 Patch1001:      neovim-cmake-lua-5.1.patch
 
@@ -65,7 +67,7 @@ BuildRequires:  jemalloc-devel
 %endif
 BuildRequires:  msgpack-devel >= 3.1.0
 BuildRequires:  libtermkey-devel
-BuildRequires:  libuv-devel >= 1.28.0
+BuildRequires:  libuv-devel >= 1.42.0
 BuildRequires:  libvterm-devel >= 0.1.4
 BuildRequires:  unibilium-devel
 BuildRequires:  libtree-sitter-devel >= 0.20.0
@@ -87,6 +89,8 @@ parts of Vim, without compromise, and more.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %if %{without luajit}
 %patch1000 -p1
 %patch1001 -p1
@@ -150,7 +154,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/menu.vim
 %{_datadir}/nvim/runtime/mswin.vim
 %{_datadir}/nvim/runtime/optwin.vim
-%{_datadir}/nvim/runtime/rgb.txt
 %{_datadir}/nvim/runtime/scripts.vim
 %{_datadir}/nvim/runtime/synmenu.vim
 
@@ -201,9 +204,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %dir %{_datadir}/nvim/runtime/autoload/dist
 %{_datadir}/nvim/runtime/autoload/dist/ft.vim
 
-%dir %{_datadir}/nvim/runtime/autoload/health/
-%{_datadir}/nvim/runtime/autoload/health/treesitter.vim
-
 %dir %{_datadir}/nvim/runtime/autoload/provider
 %{_datadir}/nvim/runtime/autoload/provider/clipboard.vim
 %{_datadir}/nvim/runtime/autoload/provider/node.vim
@@ -329,9 +329,11 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/compiler/rubyunit.vim
 %{_datadir}/nvim/runtime/compiler/rustc.vim
 %{_datadir}/nvim/runtime/compiler/sass.vim
+%{_datadir}/nvim/runtime/compiler/scdoc.vim
 %{_datadir}/nvim/runtime/compiler/se.vim
 %{_datadir}/nvim/runtime/compiler/shellcheck.vim
 %{_datadir}/nvim/runtime/compiler/sml.vim
+%{_datadir}/nvim/runtime/compiler/spectral.vim
 %{_datadir}/nvim/runtime/compiler/splint.vim
 %{_datadir}/nvim/runtime/compiler/stack.vim
 %{_datadir}/nvim/runtime/compiler/standard.vim
@@ -346,6 +348,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/compiler/xmllint.vim
 %{_datadir}/nvim/runtime/compiler/xmlwf.vim
 %{_datadir}/nvim/runtime/compiler/xo.vim
+%{_datadir}/nvim/runtime/compiler/yamllint.vim
 %{_datadir}/nvim/runtime/compiler/zsh.vim
 
 %dir %{_datadir}/nvim/runtime/doc
@@ -357,7 +360,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/doc/cmdline.txt
 %{_datadir}/nvim/runtime/doc/debug.txt
 %{_datadir}/nvim/runtime/doc/deprecated.txt
+%{_datadir}/nvim/runtime/doc/dev_style.txt
 %{_datadir}/nvim/runtime/doc/develop.txt
+%{_datadir}/nvim/runtime/doc/diagnostic.txt
 %{_datadir}/nvim/runtime/doc/diff.txt
 %{_datadir}/nvim/runtime/doc/digraph.txt
 %{_datadir}/nvim/runtime/doc/editing.txt
@@ -412,7 +417,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/doc/quickfix.txt
 %{_datadir}/nvim/runtime/doc/quickref.txt
 %{_datadir}/nvim/runtime/doc/recover.txt
-%{_datadir}/nvim/runtime/doc/remote.txt
 %{_datadir}/nvim/runtime/doc/remote_plugin.txt
 %{_datadir}/nvim/runtime/doc/repeat.txt
 %{_datadir}/nvim/runtime/doc/rileft.txt
@@ -497,6 +501,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/cfg.vim
 %{_datadir}/nvim/runtime/ftplugin/ch.vim
 %{_datadir}/nvim/runtime/ftplugin/changelog.vim
+%{_datadir}/nvim/runtime/ftplugin/checkhealth.vim
 %{_datadir}/nvim/runtime/ftplugin/chicken.vim
 %{_datadir}/nvim/runtime/ftplugin/clojure.vim
 %{_datadir}/nvim/runtime/ftplugin/cmake.vim
@@ -572,7 +577,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/javascriptreact.vim
 %{_datadir}/nvim/runtime/ftplugin/jproperties.vim
 %{_datadir}/nvim/runtime/ftplugin/json.vim
+%{_datadir}/nvim/runtime/ftplugin/jsonc.vim
 %{_datadir}/nvim/runtime/ftplugin/jsp.vim
+%{_datadir}/nvim/runtime/ftplugin/julia.vim
 %{_datadir}/nvim/runtime/ftplugin/kconfig.vim
 %{_datadir}/nvim/runtime/ftplugin/kwt.vim
 %{_datadir}/nvim/runtime/ftplugin/ld.vim
@@ -615,11 +622,13 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/nanorc.vim
 %{_datadir}/nvim/runtime/ftplugin/neomuttrc.vim
 %{_datadir}/nvim/runtime/ftplugin/netrc.vim
+%{_datadir}/nvim/runtime/ftplugin/nginx.vim
 %{_datadir}/nvim/runtime/ftplugin/nroff.vim
 %{_datadir}/nvim/runtime/ftplugin/nsis.vim
 %{_datadir}/nvim/runtime/ftplugin/objc.vim
 %{_datadir}/nvim/runtime/ftplugin/ocaml.vim
 %{_datadir}/nvim/runtime/ftplugin/occam.vim
+%{_datadir}/nvim/runtime/ftplugin/octave.vim
 %{_datadir}/nvim/runtime/ftplugin/pamconf.vim
 %{_datadir}/nvim/runtime/ftplugin/pascal.vim
 %{_datadir}/nvim/runtime/ftplugin/passwd.vim
@@ -650,6 +659,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/rmd.vim
 %{_datadir}/nvim/runtime/ftplugin/rnc.vim
 %{_datadir}/nvim/runtime/ftplugin/rnoweb.vim
+%{_datadir}/nvim/runtime/ftplugin/routeros.vim
 %{_datadir}/nvim/runtime/ftplugin/rpl.vim
 %{_datadir}/nvim/runtime/ftplugin/rrst.vim
 %{_datadir}/nvim/runtime/ftplugin/rst.vim
@@ -660,6 +670,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/scala.vim
 %{_datadir}/nvim/runtime/ftplugin/scheme.vim
 %{_datadir}/nvim/runtime/ftplugin/screen.vim
+%{_datadir}/nvim/runtime/ftplugin/scdoc.vim
 %{_datadir}/nvim/runtime/ftplugin/scss.vim
 %{_datadir}/nvim/runtime/ftplugin/sensors.vim
 %{_datadir}/nvim/runtime/ftplugin/services.vim
@@ -688,6 +699,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/ftplugin/tex.vim
 %{_datadir}/nvim/runtime/ftplugin/text.vim
 %{_datadir}/nvim/runtime/ftplugin/tidy.vim 
+%{_datadir}/nvim/runtime/ftplugin/toml.vim 
 %{_datadir}/nvim/runtime/ftplugin/tmux.vim
 %{_datadir}/nvim/runtime/ftplugin/treetop.vim
 %{_datadir}/nvim/runtime/ftplugin/tt2html.vim
@@ -771,7 +783,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/indent/javascript.vim
 %{_datadir}/nvim/runtime/indent/javascriptreact.vim
 %{_datadir}/nvim/runtime/indent/json.vim
+%{_datadir}/nvim/runtime/indent/jsonc.vim
 %{_datadir}/nvim/runtime/indent/jsp.vim
+%{_datadir}/nvim/runtime/indent/julia.vim
 %{_datadir}/nvim/runtime/indent/ld.vim
 %{_datadir}/nvim/runtime/indent/less.vim
 %{_datadir}/nvim/runtime/indent/lifelines.vim
@@ -785,6 +799,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/indent/mf.vim
 %{_datadir}/nvim/runtime/indent/mma.vim
 %{_datadir}/nvim/runtime/indent/mp.vim
+%{_datadir}/nvim/runtime/indent/nginx.vim
 %{_datadir}/nvim/runtime/indent/nsis.vim
 %{_datadir}/nvim/runtime/indent/objc.vim
 %{_datadir}/nvim/runtime/indent/ocaml.vim
@@ -939,27 +954,34 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/keymap/vietnamese-vni_utf-8.vim
 
 %dir %{_datadir}/nvim/runtime/lua
+%{_datadir}/nvim/runtime/lua/health.lua
 %{_datadir}/nvim/runtime/lua/man.lua
 
 %dir %{_datadir}/nvim/runtime/lua/vim
 %{_datadir}/nvim/runtime/lua/vim/F.lua
 %{_datadir}/nvim/runtime/lua/vim/_meta.lua
 %{_datadir}/nvim/runtime/lua/vim/compat.lua
+%{_datadir}/nvim/runtime/lua/vim/diagnostic.lua
 %{_datadir}/nvim/runtime/lua/vim/highlight.lua
 %{_datadir}/nvim/runtime/lua/vim/inspect.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp.lua
 %{_datadir}/nvim/runtime/lua/vim/shared.lua
 %{_datadir}/nvim/runtime/lua/vim/treesitter.lua
+%{_datadir}/nvim/runtime/lua/vim/ui.lua
 %{_datadir}/nvim/runtime/lua/vim/uri.lua
 
 %dir %{_datadir}/nvim/runtime/lua/vim/lsp/
+%{_datadir}/nvim/runtime/lua/vim/lsp/_snippet.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/buf.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/codelens.lua  
 %{_datadir}/nvim/runtime/lua/vim/lsp/diagnostic.lua
+%{_datadir}/nvim/runtime/lua/vim/lsp/health.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/handlers.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/log.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/protocol.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/rpc.lua
+%{_datadir}/nvim/runtime/lua/vim/lsp/sync.lua
+%{_datadir}/nvim/runtime/lua/vim/lsp/tagfunc.lua
 %{_datadir}/nvim/runtime/lua/vim/lsp/util.lua 
 
 %dir %{_datadir}/nvim/runtime/lua/vim/treesitter/
@@ -1149,6 +1171,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/change.vim
 %{_datadir}/nvim/runtime/syntax/changelog.vim
 %{_datadir}/nvim/runtime/syntax/chaskell.vim
+%{_datadir}/nvim/runtime/syntax/checkhealth.vim
 %{_datadir}/nvim/runtime/syntax/cheetah.vim
 %{_datadir}/nvim/runtime/syntax/chicken.vim
 %{_datadir}/nvim/runtime/syntax/chill.vim
@@ -1267,6 +1290,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/gdb.vim
 %{_datadir}/nvim/runtime/syntax/gdmo.vim
 %{_datadir}/nvim/runtime/syntax/gedcom.vim
+%{_datadir}/nvim/runtime/syntax/gemtext.vim
 %{_datadir}/nvim/runtime/syntax/gift.vim
 %{_datadir}/nvim/runtime/syntax/git.vim
 %{_datadir}/nvim/runtime/syntax/gitcommit.vim
@@ -1290,6 +1314,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/grub.vim
 %{_datadir}/nvim/runtime/syntax/gsp.vim
 %{_datadir}/nvim/runtime/syntax/gtkrc.vim
+%{_datadir}/nvim/runtime/syntax/gvpr.vim
 %{_datadir}/nvim/runtime/syntax/haml.vim
 %{_datadir}/nvim/runtime/syntax/hamster.vim
 %{_datadir}/nvim/runtime/syntax/haskell.vim
@@ -1339,7 +1364,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/jovial.vim
 %{_datadir}/nvim/runtime/syntax/jproperties.vim
 %{_datadir}/nvim/runtime/syntax/json.vim
+%{_datadir}/nvim/runtime/syntax/jsonc.vim
 %{_datadir}/nvim/runtime/syntax/jsp.vim
+%{_datadir}/nvim/runtime/syntax/julia.vim
 %{_datadir}/nvim/runtime/syntax/kconfig.vim
 %{_datadir}/nvim/runtime/syntax/kivy.vim
 %{_datadir}/nvim/runtime/syntax/kix.vim
@@ -1432,6 +1459,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/neomuttrc.vim
 %{_datadir}/nvim/runtime/syntax/netrc.vim
 %{_datadir}/nvim/runtime/syntax/netrw.vim
+%{_datadir}/nvim/runtime/syntax/nginx.vim
 %{_datadir}/nvim/runtime/syntax/ninja.vim
 %{_datadir}/nvim/runtime/syntax/nosyntax.vim
 %{_datadir}/nvim/runtime/syntax/nqc.vim
@@ -1523,6 +1551,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/rnoweb.vim
 %{_datadir}/nvim/runtime/syntax/robots.vim
 %{_datadir}/nvim/runtime/syntax/rpcgen.vim
+%{_datadir}/nvim/runtime/syntax/routeros.vim
 %{_datadir}/nvim/runtime/syntax/rpl.vim
 %{_datadir}/nvim/runtime/syntax/rrst.vim
 %{_datadir}/nvim/runtime/syntax/rst.vim
@@ -1539,6 +1568,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/scilab.vim
 %{_datadir}/nvim/runtime/syntax/screen.vim
 %{_datadir}/nvim/runtime/syntax/scss.vim
+%{_datadir}/nvim/runtime/syntax/scdoc.vim
 %{_datadir}/nvim/runtime/syntax/sd.vim
 %{_datadir}/nvim/runtime/syntax/sdc.vim
 %{_datadir}/nvim/runtime/syntax/sdl.vim
@@ -1602,12 +1632,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/stata.vim
 %{_datadir}/nvim/runtime/syntax/stp.vim
 %{_datadir}/nvim/runtime/syntax/strace.vim
+%{_datadir}/nvim/runtime/syntax/structurizr.vim
 %{_datadir}/nvim/runtime/syntax/sudoers.vim
 %{_datadir}/nvim/runtime/syntax/svg.vim
 %{_datadir}/nvim/runtime/syntax/svn.vim
 %{_datadir}/nvim/runtime/syntax/swift.vim
 %{_datadir}/nvim/runtime/syntax/swiftgyb.vim
-%{_datadir}/nvim/runtime/syntax/syncolor.vim
 %{_datadir}/nvim/runtime/syntax/synload.vim
 %{_datadir}/nvim/runtime/syntax/syntax.vim
 %{_datadir}/nvim/runtime/syntax/sysctl.vim
@@ -1636,6 +1666,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/syntax/tilde.vim
 %{_datadir}/nvim/runtime/syntax/tli.vim
 %{_datadir}/nvim/runtime/syntax/tmux.vim
+%{_datadir}/nvim/runtime/syntax/toml.vim
 %{_datadir}/nvim/runtime/syntax/tpp.vim
 %{_datadir}/nvim/runtime/syntax/trasys.vim
 %{_datadir}/nvim/runtime/syntax/treetop.vim
@@ -1729,6 +1760,18 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
 %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
 
 %changelog
+* Sat Jan 01 2022 Andreas Schneider <asn@redhat.com> - 0.6.1-1
+- Update to version 0.6.1
+
+* Wed Dec 01 2021 Andreas Schneider <asn@redhat.com> - 0.6.0-1
+- Update to version 0.6.0
+
+* Thu Oct 28 2021 Andreas Schneider <asn@redhat.com> - 0.5.1-2
+- Use luajit also on aarch64
+
+* Mon Sep 27 2021 Andreas Schneider <asn@redhat.com> - 0.5.1-1
+- Update to version 0.5.1
+
 * Fri Jul 30 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-5
 - Build with luajit2.1-luv when we use luajit
 
diff --git a/sources b/sources
index a5bc522..9c2c738 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neovim-0.5.0.tar.gz) = f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4
+SHA512 (neovim-0.6.1.tar.gz) = 399489f6aaabec2a89b695b22dcd860149acaad723372cced0b4d2cdae464e2db5758372b9123cd0d2a683e0ea42b871935eb85e550cecce620d896691cfda53