diff --git a/patch/curl_getenv.diff b/patch/curl_getenv.diff
index 3bbf48a..4f46c1b 100644
--- a/patch/curl_getenv.diff
+++ b/patch/curl_getenv.diff
@@ -1,8 +1,11 @@
-diff --git "a/D:\\_Sandbox\\curl\\curl-x86\\lib\\getenv.c.orig" "b/D:\\_Sandbox\\curl\\curl-x86\\lib\\getenv.c"
-index 92c5350..1d3b0cb 100644
---- "a/lib/getenv.c"
-+++ "b/lib/getenv.c"
-@@ -24,25 +24,23 @@
+ lib/getenv.c | 49 +++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/lib/getenv.c b/lib/getenv.c
+index 5f00fd1..3eff07a 100644
+--- a/lib/getenv.c
++++ b/lib/getenv.c
+@@ -26,25 +26,23 @@
  
  #include <curl/curl.h>
  #include "curl_memory.h"
@@ -34,7 +37,7 @@ index 92c5350..1d3b0cb 100644
      if(!tmp) {
        free(buf);
        return NULL;
-@@ -53,25 +51,44 @@ static char *GetEnv(const char *variable)
+@@ -55,25 +53,44 @@ static char *GetEnv(const char *variable)
  
      /* It's possible for rc to be 0 if the variable was found but empty.
         Since getenv doesn't make that distinction we ignore it as well. */
diff --git a/patch/curl_threads.diff b/patch/curl_threads.diff
index 087e193..e838083 100644
--- a/patch/curl_threads.diff
+++ b/patch/curl_threads.diff
@@ -1,8 +1,11 @@
-diff --git "a/D:\\_Sandbox\\curl\\curl-src\\lib\\curl_threads.h.orig" "b/D:\\_Sandbox\\curl\\curl-src\\lib\\curl_threads.h"
-index e10b7a1..22fdb49 100644
---- "a/lib/curl_threads.h"
-+++ "b/lib/curl_threads.h"
-@@ -37,13 +37,7 @@
+ lib/curl_threads.h | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/lib/curl_threads.h b/lib/curl_threads.h
+index 63392f6..8a40108 100644
+--- a/lib/curl_threads.h
++++ b/lib/curl_threads.h
+@@ -39,13 +39,7 @@
  #  define curl_mutex_t           CRITICAL_SECTION
  #  define curl_thread_t          HANDLE
  #  define curl_thread_t_null     (HANDLE)0
diff --git a/patch/curl_tool_doswin.diff b/patch/curl_tool_doswin.diff
index 0b2253c..098cdf8 100644
--- a/patch/curl_tool_doswin.diff
+++ b/patch/curl_tool_doswin.diff
@@ -1,8 +1,11 @@
+ src/tool_doswin.c | 49 ++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 34 insertions(+), 15 deletions(-)
+
 diff --git a/src/tool_doswin.c b/src/tool_doswin.c
-index 9b6a7d5..93d0814 100644
+index d8695e9..27dc9b6 100644
 --- a/src/tool_doswin.c
 +++ b/src/tool_doswin.c
-@@ -612,6 +612,37 @@ char **__crt0_glob_function(char *arg)
+@@ -614,6 +614,37 @@ char **__crt0_glob_function(char *arg)
   * HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\SafeProcessSearchMode
   */
  
@@ -40,7 +43,7 @@ index 9b6a7d5..93d0814 100644
  CURLcode FindWin32CACert(struct OperationConfig *config,
                           curl_sslbackend backend,
                           const TCHAR *bundle_file)
-@@ -627,21 +658,9 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
+@@ -629,21 +660,9 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
    if((curlinfo->features & CURL_VERSION_SSL) &&
       backend != CURLSSLBACKEND_SCHANNEL) {
  
diff --git a/patch/curl_tool_parsecfg.diff b/patch/curl_tool_parsecfg.diff
index c5f24fd..9285e78 100644
--- a/patch/curl_tool_parsecfg.diff
+++ b/patch/curl_tool_parsecfg.diff
@@ -1,8 +1,11 @@
-diff --git "a/src/tool_parsecfg.c" "b/src/tool_parsecfg.c"
-index 3630cec..8a44369 100644
---- "a/src/tool_parsecfg.c"
-+++ "b/src/tool_parsecfg.c"
-@@ -45,29 +45,20 @@ static const char *unslashquote(const char *line, char *param);
+ src/tool_parsecfg.c | 42 ++++++++++++++++--------------------------
+ 1 file changed, 16 insertions(+), 26 deletions(-)
+
+diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
+index a166757..6a00b80 100644
+--- a/src/tool_parsecfg.c
++++ b/src/tool_parsecfg.c
+@@ -47,29 +47,20 @@ static const char *unslashquote(const char *line, char *param);
  static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error);
  
  #ifdef WIN32
@@ -44,7 +47,7 @@ index 3630cec..8a44369 100644
      }
    }
  
-@@ -87,7 +78,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
+@@ -89,7 +80,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
  
    if(!filename) {
      /* NULL means load .curlrc from homedir! */
@@ -53,7 +56,7 @@ index 3630cec..8a44369 100644
      if(curlrc) {
        file = fopen(curlrc, FOPEN_READTEXT);
        if(!file) {
-@@ -98,14 +89,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
+@@ -100,14 +91,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
      }
  #ifdef WIN32 /* Windows */
      else {