diff --git a/driver/stub/usbip_stub.inx b/driver/stub/usbip_stub.inx
index ae1c3d9d..f20e7a32 100644
--- a/driver/stub/usbip_stub.inx
+++ b/driver/stub/usbip_stub.inx
@@ -12,7 +12,7 @@ Class=System
 ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
 Provider=%OpenSource%
 CatalogFile=usbip_stub.cat
-DriverVer = 07/19/2021,0.3.5.0
+DriverVer = 06/17/2022,0.3.6.0
 
 [Manufacturer]
 %StdMfg%=Standard,NTamd64
diff --git a/driver/vhci/usbip_vhci.vcxproj b/driver/vhci/usbip_vhci.vcxproj
index 03f57fe5..be70fe19 100644
--- a/driver/vhci/usbip_vhci.vcxproj
+++ b/driver/vhci/usbip_vhci.vcxproj
@@ -212,7 +212,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -236,7 +236,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -261,7 +261,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -286,7 +286,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_VB_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -308,7 +308,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -333,7 +333,7 @@
       <AdditionalDependencies>$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)ntstrsafe.lib;usbd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <PostBuildEvent>
       <Command>gencat.bat $(OutDir) 10_VB_$(DDKPlatform) $(SolutionDir)/driver/usbip_test.pfx
@@ -351,4 +351,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/driver/vhci_ude/usbip_vhci_ude.vcxproj b/driver/vhci_ude/usbip_vhci_ude.vcxproj
index 751a319f..982bc55e 100644
--- a/driver/vhci_ude/usbip_vhci_ude.vcxproj
+++ b/driver/vhci_ude/usbip_vhci_ude.vcxproj
@@ -231,7 +231,7 @@
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <DriverSign>
       <FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -254,7 +254,7 @@
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <DriverSign>
       <FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -278,7 +278,7 @@
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <DriverSign>
       <FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -302,7 +302,7 @@
       <Command>gencat.bat $(OutDir) 10_VB_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -322,7 +322,7 @@
       <Command>gencat.bat $(OutDir) 10_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
     <DriverSign>
       <FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -345,7 +345,7 @@
       <Command>gencat.bat $(OutDir) 10_VB_$(DDKPlatform) $(SolutionDir)\driver\usbip_test.pfx</Command>
     </PostBuildEvent>
     <Inf>
-      <TimeStamp>0.3.5.0</TimeStamp>
+      <TimeStamp>0.3.6.0</TimeStamp>
     </Inf>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -362,4 +362,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/userspace/config.h b/userspace/config.h
index 1ae2ef16..35d94ace 100644
--- a/userspace/config.h
+++ b/userspace/config.h
@@ -3,7 +3,7 @@
 #define _USBIP_CONFIG_WINDOWS_H
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "usbip-win 0.3.5"
+#define PACKAGE_STRING "usbip-win 0.3.6"
 
 /* numeric version number */
 #define USBIP_VERSION 0x000111