diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index 08aa6b39..d6302204 100644
Binary files a/doc/chm/VeraCrypt User Guide.chm and b/doc/chm/VeraCrypt User Guide.chm differ
diff --git a/doc/html/Release Notes.html b/doc/html/Release Notes.html
index a86d1dac..aaa8dead 100644
--- a/doc/html/Release Notes.html	
+++ b/doc/html/Release Notes.html	
@@ -52,6 +52,12 @@
 <li>Set minimum support for MSI installation to Windows 7.</li>
 <li>Fix failure to create Traveler Disk when VeraCrypt is installed using MSI.</li>
 <li>Fix double-clicking mounted drive in VeraCrypt UI not working in some special Windows configurations.</li>
+<li>Add registry key to fix BSOD during shutdown/reboot on some machines when using system encryption.
+<ul>
+<li>Under "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt", create a REG_DWORD value named "VeraCryptEraseKeysShutdown".</li>
+<li>Setting this registry value to 0 disables erasing system encryption keys which is the cause of BSOD during shutdown on some machines.</li>
+</ul>
+</li>
 </ul>
 </li>
 <li><strong>Linux:</strong>
diff --git a/src/Release/Setup Files/veracrypt-arm64.cat b/src/Release/Setup Files/veracrypt-arm64.cat
index 7dd138e0..19c16389 100644
Binary files a/src/Release/Setup Files/veracrypt-arm64.cat and b/src/Release/Setup Files/veracrypt-arm64.cat differ
diff --git a/src/Release/Setup Files/veracrypt-arm64.sys b/src/Release/Setup Files/veracrypt-arm64.sys
index fd4a65df..8aad60e3 100644
Binary files a/src/Release/Setup Files/veracrypt-arm64.sys and b/src/Release/Setup Files/veracrypt-arm64.sys differ
diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat
index 02cd7159..16d3016a 100644
Binary files a/src/Release/Setup Files/veracrypt-x64.cat and b/src/Release/Setup Files/veracrypt-x64.cat differ
diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys
index a7969ab3..bc2e94ee 100644
Binary files a/src/Release/Setup Files/veracrypt-x64.sys and b/src/Release/Setup Files/veracrypt-x64.sys differ
diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf
index a9c1bea3..7fa38aa1 100644
--- a/src/Release/Setup Files/veracrypt.Inf	
+++ b/src/Release/Setup Files/veracrypt.Inf	
@@ -2,7 +2,7 @@
 ;;; VeraCrypt
 ;;;
 ;;;
-;;; Copyright (c) 2021, IDRIX
+;;; Copyright (c) 2022, IDRIX
 ;;;
 
 [Version]
@@ -10,7 +10,7 @@ signature   = "$Windows NT$"
 Class       = "Encryption"                              ;This is determined by the work this filter driver does
 ClassGuid   = {a0a701c0-a511-42ff-aa6c-06dc0395576f}    ;This value is determined by the Class
 Provider    = %ProviderString%
-DriverVer   = 12/29/2021,1.25.6.1
+DriverVer   = 02/05/2022,1.25.8.0
 CatalogFile = veracrypt.cat
 
 
diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat
index 655ec398..cd02a1e3 100644
Binary files a/src/Release/Setup Files/veracrypt.cat and b/src/Release/Setup Files/veracrypt.cat differ
diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys
index 730d0f57..7273ecb1 100644
Binary files a/src/Release/Setup Files/veracrypt.sys and b/src/Release/Setup Files/veracrypt.sys differ