diff --git a/vim-8.2.3582.tar.gz b/vim-8.2.3582.tar.gz
deleted file mode 100644
index e9d3feb..0000000
--- a/vim-8.2.3582.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:363a90e45eb93c73340a711223c7ce5e564432f9eb34624e1a545f4fd57dd49d
-size 15778667
diff --git a/vim-8.2.3587.tar.gz b/vim-8.2.3587.tar.gz
new file mode 100644
index 0000000..f74bfec
--- /dev/null
+++ b/vim-8.2.3587.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a4b8d91921d0ce86e3c6e5a72fe407f6c2713ab4ef8774b480a0dd97d4d8b26
+size 15781002
diff --git a/vim.changes b/vim.changes
index a2d0e53..9baf73b 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Nov 12 18:45:45 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- fixes boo#1192631
+-  Updated to version 8.2.3587, fixes the following problems
+  * Reading uninitialized memory when giving spell suggestions.
+  * The "gd" and "gD" commands do not update search stats. (Gary Johnson)
+  * "verbose set efm" reports the location of the :compiler command. (Gary
+  Johnson)
+  * Crash when passing float to "term_rows" in the options argument of
+  term_start(). (Virginia Senioria)
+  * Command completion test fails.
+  * Compiler test fails with backslash file separator.
+
+
 -------------------------------------------------------------------
 Fri Nov  5 17:51:31 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/vim.spec b/vim.spec
index 0ac0d6b..767917e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -17,7 +17,7 @@
 
 
 %define pkg_version 8.2
-%define patchlevel 3582
+%define patchlevel 3587
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim82
 %define site_runtimepath %{_datadir}/vim/site
@@ -345,12 +345,12 @@ ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/vim
 mkdir -p %{buildroot}%{_datadir}/libalternatives/vi
 cat > %{buildroot}%{_datadir}/libalternatives/vi/20.conf <<EOF
 binary=%{_bindir}/vim-nox11
-group=vim, vi
+group=vim, vi, eview, evim, rview, rvim, vimdiff, edit, ex
 options=KeepArgv0
 EOF
 cat > %{buildroot}%{_datadir}/libalternatives/vi/30.conf <<EOF
 binary=%{_bindir}/gvim
-group=vim, vi
+group=vim, vi, egvim, gview, eview, evim, gex, gvi, gview, gvimdiff, rgview, rgvim
 options=KeepArgv0
 EOF
 cat > %{buildroot}%{_datadir}/libalternatives/vi/19.conf <<EOF
@@ -361,12 +361,12 @@ EOF
 mkdir -p %{buildroot}%{_datadir}/libalternatives/vim
 cat > %{buildroot}%{_datadir}/libalternatives/vim/20.conf <<EOF
 binary=%{_bindir}/vim-nox11
-group=vim, vi
+group=vim, vi, eview, evim, rview, rvim, vimdiff, edit, ex
 options=KeepArgv0
 EOF
 cat > %{buildroot}%{_datadir}/libalternatives/vim/30.conf <<EOF
 binary=%{_bindir}/gvim
-group=vim, vi
+group=vim, vi, egvim, gview, eview, evim, gex, gvi, gview, gvimdiff, rgview, rgvim
 options=KeepArgv0
 EOF
 cat > %{buildroot}%{_datadir}/libalternatives/vim/19.conf <<EOF