diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd24bc19..311e6f82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2.1000] - 2021-02-06
+
+### Fixed
+- Library - Fix `DokanResetTimeout` DokanFileInfo usage.
+- Library - Correctly set PullEventTimeoutMs value.
+- Kernel - Fix notify queue timeout value and timeout detection.
+- Memfs - Fix `SetFileAttributes` behavior.
+- Library - Fix incorrect lock used for DokanOpenInfo `OpenCount` increments.
+
+### Changed
+- Library - Use multiple main pull thread (4 instead of 1) to avoid deadlock during low activity.
+
 ## [2.0.1.2000] - 2021-01-28
 
 ### Fixed
@@ -616,6 +628,7 @@ Latest Dokan version from Hiroki Asakawa.
  [http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/)
 
 
+[2.0.2.1000]: https://github.com/dokan-dev/dokany/compare/v2.0.1.2000...v2.0.2.1000
 [2.0.1.2000]: https://github.com/dokan-dev/dokany/compare/v2.0.1.1000...v2.0.1.2000
 [2.0.1.1000]: https://github.com/dokan-dev/dokany/compare/v2.0.0.2000...v2.0.1.1000
 [2.0.0.2000]: https://github.com/dokan-dev/dokany/compare/v2.0.0.1000...v2.0.0.2000
diff --git a/Dokan.props b/Dokan.props
index 4651a4d8..e3a9dc97 100644
--- a/Dokan.props
+++ b/Dokan.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <DOKANAPIVersion>2</DOKANAPIVersion>
-    <DOKANVersion>2.0.1</DOKANVersion>
+    <DOKANVersion>2.0.2</DOKANVersion>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />
diff --git a/dokan/dokan.h b/dokan/dokan.h
index a8f18a1c..94472532 100644
--- a/dokan/dokan.h
+++ b/dokan/dokan.h
@@ -56,7 +56,7 @@ extern "C" {
 /** @{ */
 
 /** The current Dokan version (200 means ver 2.0.0). \ref DOKAN_OPTIONS.Version */
-#define DOKAN_VERSION 201
+#define DOKAN_VERSION 202
 /** Minimum Dokan version (ver 2.0.0) accepted. */
 #define DOKAN_MINIMUM_COMPATIBLE_VERSION 200
 /** Driver file name including the DOKAN_MAJOR_API_VERSION */
diff --git a/dokan/dokan.rc b/dokan/dokan.rc
index a1bf84b5..1ed99320 100644
--- a/dokan/dokan.rc
+++ b/dokan/dokan.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,2000
- PRODUCTVERSION 2,0,1,2000
+ FILEVERSION 2,0,2,1000
+ PRODUCTVERSION 2,0,2,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Library"
-            VALUE "FileVersion", "2.0.1.2000"
+            VALUE "FileVersion", "2.0.2.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokan.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.0.1.2000"
+            VALUE "ProductVersion", "2.0.2.1000"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/dokan_fuse/src/dokanfuse.rc b/dokan_fuse/src/dokanfuse.rc
index 300dd800..99060340 100644
--- a/dokan_fuse/src/dokanfuse.rc
+++ b/dokan_fuse/src/dokanfuse.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,2000
- PRODUCTVERSION 2,0,1,2000
+ FILEVERSION 2,0,2,1000
+ PRODUCTVERSION 2,0,2,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Fuse library"
-            VALUE "FileVersion", "2.0.1.2000"
+            VALUE "FileVersion", "2.0.2.1000"
             VALUE "InternalName", "dokanfuse.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokanfuse.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.0.1.2000"
+            VALUE "ProductVersion", "2.0.2.1000"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/dokan_np/dokan_np.rc b/dokan_np/dokan_np.rc
index b64042fa..2ac4b0a0 100644
--- a/dokan_np/dokan_np.rc
+++ b/dokan_np/dokan_np.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,2000
- PRODUCTVERSION 2,0,1,2000
+ FILEVERSION 2,0,2,1000
+ PRODUCTVERSION 2,0,2,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Network Provider"
-            VALUE "FileVersion", "2.0.1.2000"
+            VALUE "FileVersion", "2.0.2.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokannp.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.0.1.2000"
+            VALUE "ProductVersion", "2.0.2.1000"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/dokan_wix/version.xml b/dokan_wix/version.xml
index 5651a79e..dc956da5 100644
--- a/dokan_wix/version.xml
+++ b/dokan_wix/version.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 <?define ProductName="Dokan Library" ?>
-<?define ProductCodeX64="{DB21E410-4FE3-0200-0001-220128085944}" ?>
+<?define ProductCodeX64="{DB21E410-4FE3-0200-0002-220206123355}" ?>
 <?define UpgradeCodeX64="{FC60082A-8D90-4AEB-901A-C5E38682B830}" ?>
-<?define ProductCodeX86="{DB21E410-4FE3-0200-0001-220128085944}" ?>
+<?define ProductCodeX86="{DB21E410-4FE3-0200-0002-220206123355}" ?>
 <?define UpgradeCodeX86="{FC60082A-8D90-4AEB-901A-C5E38682B830}" ?>
 <?define ProviderKey="{5F030BFA-CE6E-408A-9694-F593B319DBBE}" ?>
 <?define BundleUpgradeCode="{832B1FAC-B29B-4DDC-A449-007F63A4A1EF}" ?>
-<?define BaseVersion="2.0.1" ?>
+<?define BaseVersion="2.0.2" ?>
 <?define MajorVersion="2" ?>
-<?define BuildVersion="2000" ?>
+<?define BuildVersion="1000" ?>
 <?define CompanyName="Dokany Project" ?>
 <?define ShortCompanyName="Dokany Project" ?>
 <?define UpdateURL="https://dokan-dev.github.io/" ?>
diff --git a/sys/dokan.rc b/sys/dokan.rc
index aebe3adb..3fd83c48 100644
--- a/sys/dokan.rc
+++ b/sys/dokan.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,2000
- PRODUCTVERSION 2,0,1,2000
+ FILEVERSION 2,0,2,1000
+ PRODUCTVERSION 2,0,2,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Driver"
-            VALUE "FileVersion", "2.0.1.2000"
+            VALUE "FileVersion", "2.0.2.1000"
             VALUE "InternalName", "dokan.sys"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokan.sys"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.0.1.2000"
+            VALUE "ProductVersion", "2.0.2.1000"
         END
     END
     BLOCK "VarFileInfo"