diff --git a/SPECS/vim/vim.signatures.json b/SPECS/vim/vim.signatures.json
index 4d3022e7614..0b01e59fbc0 100644
--- a/SPECS/vim/vim.signatures.json
+++ b/SPECS/vim/vim.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "vim-8.2.4979.tar.gz": "7f8b709039480ebceb0f0d089183bedf48f2a51f56292537c69c00c19d87fbde"
+  "vim-8.2.5064.tar.gz": "3e3f9f073ea9470482476db2c0a12a85af0a9e9d34478f3c4f924e33bb267c46"
  }
 }
diff --git a/SPECS/vim/vim.spec b/SPECS/vim/vim.spec
index f127d61f995..9041bb860d3 100755
--- a/SPECS/vim/vim.spec
+++ b/SPECS/vim/vim.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Summary:        Text editor
 Name:           vim
-Version:        8.2.4979
+Version:        8.2.5064
 Release:        1%{?dist}
 License:        Vim
 Vendor:         Microsoft Corporation
@@ -193,6 +193,9 @@ fi
 %{_bindir}/vimdiff
 
 %changelog
+* Mon Jun 06 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.2.5064-1
+- Update to version 8.2.5064 to fix CVEs: 2022-1851, 2022-1886, and 2022-1898.
+
 * Fri May 27 2022 Max Brodeur-Urbas <maxbr@microsoft.com> - 8.2.4979-1
 - Update version to 8.2.4979 to fix CVE-2022-1619, CVE-2022-1621, CVE-2022-1629, 
   CVE-2022-1616, CVE-2022-1733, CVE-2022-1735, CVE-2022-1769, CVE-2022-1620, 
diff --git a/cgmanifest.json b/cgmanifest.json
index 067aeb172f2..af60e8e7096 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -26057,8 +26057,8 @@
         "type": "other",
         "other": {
           "name": "vim",
-          "version": "8.2.4979",
-          "downloadUrl": "https://github.com/vim/vim/archive/v8.2.4979.tar.gz"
+          "version": "8.2.5064",
+          "downloadUrl": "https://github.com/vim/vim/archive/v8.2.5064.tar.gz"
         }
       }
     },