diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index c758b623..2ce89324 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -525,14 +525,17 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
     static char pbuf[8192];
     char *p=NULL;
     *response = 0;
-    if (getProxyInfo(pbuf)) {
-        p=my_strstr(pbuf,"http=");
-        if (!p) p=pbuf;
-        else {
-            p+=5;
-            char *tp=my_strstr(p,";");
-            if (tp) *tp=0;
-        }
+    if (getProxyInfo(pbuf))
+    {
+      p=my_strstr(pbuf,"http=");
+      if (!p) p=pbuf;
+      else {
+        p+=5;
+      }
+      char *tp=my_strstr(p,";");
+      if (tp) *tp=0;
+      char *p2=my_strstr(p,"=");
+      if (p2) p=0; // we found the wrong proxy
     }
     if (!g_dns) {
         g_dns = new JNL_AsyncDNS();
diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp
index 999e670a..de6447a3 100644
--- a/Contrib/NSISdl/nsisdl.cpp
+++ b/Contrib/NSISdl/nsisdl.cpp
@@ -146,14 +146,15 @@ void downloadFile(char         *url,
   char *p=NULL;
   if (getProxyInfo(buf))
   {
-    p=_strstr(buf,"http=");
+    p=strstr(buf,"http=");
     if (!p) p=buf;
-    else 
-    {
+    else {
       p+=5;
-      char *tp=_strstr(p,";");
-      if (tp) *tp=0;
     }
+    char *tp=strstr(p,";");
+    if (tp) *tp=0;
+    char *p2=strstr(p,"=");
+    if (p2) p=0; // we found the wrong proxy
   }
   DWORD start_time=GetTickCount();
   JNL_HTTPGet *get=new JNL_HTTPGet(JNL_CONNECTION_AUTODNS,16384,(p&&p[0])?p:NULL);
diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll
index 51020545..42dc04bf 100644
Binary files a/Plugins/nsisdl.dll and b/Plugins/nsisdl.dll differ