diff --git a/README.md b/README.md
index aaacbd2..53c17df 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 NVENC and NvFBC patches for Nvidia drivers
 ==========================================
 
-![GitHub last commit](https://img.shields.io/github/last-commit/keylase/nvidia-patch.svg) ![Latest version](https://img.shields.io/badge/latest%20linux%20driver%20version-555.42.02-brightgreen.svg)
+![GitHub last commit](https://img.shields.io/github/last-commit/keylase/nvidia-patch.svg) ![Latest version](https://img.shields.io/badge/latest%20linux%20driver%20version-555.58-brightgreen.svg)
 
 [NVENC patch](patch.sh) removes restriction on maximum number of simultaneous NVENC video encoding sessions imposed by Nvidia to consumer-grade GPUs.
 
@@ -213,6 +213,7 @@ If you want to donate, please send it to your favorite open source organizations
 | 550.78 | YES | YES | [Driver link](http://international.download.nvidia.com/XFree86/Linux-x86_64/550.78/NVIDIA-Linux-x86_64-550.78.run) |
 | 550.90.07 | YES | YES | [Driver link](http://international.download.nvidia.com/XFree86/Linux-x86_64/550.90.07/NVIDIA-Linux-x86_64-550.90.07.run) |
 | 555.42.02 | YES | YES | [Driver link](http://international.download.nvidia.com/XFree86/Linux-x86_64/555.42.02/NVIDIA-Linux-x86_64-555.42.02.run) |
+| 555.58 | YES | YES | [Driver link](http://international.download.nvidia.com/XFree86/Linux-x86_64/555.58/NVIDIA-Linux-x86_64-555.58.run) |
 
 ## Synopsis
 
diff --git a/drivers.json b/drivers.json
index 537a2f9..0b09e8c 100644
--- a/drivers.json
+++ b/drivers.json
@@ -1079,6 +1079,12 @@
                     "nvenc_patch": true,
                     "nvfbc_patch": true,
                     "driver_url": "http://international.download.nvidia.com/XFree86/Linux-x86_64/535.183.01/NVIDIA-Linux-x86_64-535.183.01.run"
+                },
+                {
+                    "version": "555.58",
+                    "nvenc_patch": true,
+                    "nvfbc_patch": true,
+                    "driver_url": "http://international.download.nvidia.com/XFree86/Linux-x86_64/555.58/NVIDIA-Linux-x86_64-555.58.run"
                 }
             ],
             "example": {
diff --git a/patch-fbc.sh b/patch-fbc.sh
index 1bd22b5..844dcfc 100755
--- a/patch-fbc.sh
+++ b/patch-fbc.sh
@@ -206,6 +206,7 @@ declare -A patch_list=(
     ["550.90.07"]='s/\x83\xfe\x01\x73\x08\x48/\x83\xfe\x01\x90\x90\x48/'
     ["555.42.02"]='s/\x85\xc0\x0f\x85\x9b\x00\x00\x00\x48/\x85\xc0\x90\x90\x90\x90\x90\x90\x48/g'
     ["555.52.04"]='s/\x85\xc0\x0f\x85\x9b\x00\x00\x00\x48/\x85\xc0\x90\x90\x90\x90\x90\x90\x48/g'
+    ["555.58"]='s/\x85\xc0\x0f\x85\x9b\x00\x00\x00\x48/\x85\xc0\x90\x90\x90\x90\x90\x90\x48/g'
 )
 
 check_version_supported () {
diff --git a/patch.sh b/patch.sh
index 722c7c5..f7f71ba 100755
--- a/patch.sh
+++ b/patch.sh
@@ -245,6 +245,7 @@ declare -A patch_list=(
     ["550.90.07"]='s/\xe8\x25\x54\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x25\x54\xfe\xff\x29\xc0\x41\x89\xc4/g'
     ["555.42.02"]='s/\xe8\x25\x43\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x25\x43\xfe\xff\x29\xc0\x41\x89\xc4/g'
     ["555.52.04"]='s/\xe8\x25\x43\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x25\x43\xfe\xff\x29\xc0\x41\x89\xc4/g'
+    ["555.58"]='s/\xe8\x25\x43\xfe\xff\x85\xc0\x41\x89\xc4/\xe8\x25\x43\xfe\xff\x29\xc0\x41\x89\xc4/g'
 )
 
 check_version_supported () {