diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 61612d25..d2fda8cd 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -134,7 +134,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
             if (num==1) {
                 DragQueryFile((HDROP)wParam,0,szTmp,MAX_PATH);
                 if (lstrlen(szTmp)>0) {
-          g_sdata.script_alloced = true;
+					g_sdata.script_alloced = true;
                     g_sdata.script = (char *)GlobalAlloc(GPTR,sizeof(szTmp)+7);
                     wsprintf(g_sdata.script,"\"%s\"",szTmp);
                     ResetObjects();
@@ -218,7 +218,9 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
                 case IDM_UPDATE:
                 {
                     DWORD dwThreadId;
+					EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_GRAYED);
                     CloseHandle(CreateThread(NULL,0,UpdateThread,(LPVOID)NULL,0,&dwThreadId));
+					EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_ENABLED);
                     break;
                 }
                 case IDM_ABOUT:
@@ -528,7 +530,6 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
     static char pbuf[8192];
     char *p=NULL;
     *response = 0;
-    EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_GRAYED);
     if (getProxyInfo(pbuf))
     {
       p=my_strstr(pbuf,"http=");
@@ -548,7 +549,7 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
     lstrcpy(url,NSIS_UPDATE);
     lstrcat(url,g_sdata.brandingv);
     lstrcpy(response,"");
-    get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Q312461; .NET CLR 1.0.3705)");
+    get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 4.0)");
     get->addheader("Accept:*/*");
     get->connect(url);
     while (1) {
@@ -595,6 +596,5 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
     else MessageBox(g_sdata.hwnd,"There is no update available for NSIS at this time.","NSIS Update",MB_OK|MB_ICONINFORMATION); 
     GlobalFree(response);
     delete get;
-    EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_ENABLED);
     return 0;
 }
\ No newline at end of file
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index ed7f8b04..b8086286 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -28,7 +28,7 @@
 #include "jnetlib/netinc.h"
 #include "jnetlib/httpget.h"
 #define _RICHEDIT_VER 0x0200
-#include <RichEdit.h>
+#include <richedit.h>
 #undef _RICHEDIT_VER
 
 // Defines
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index dd5e646d..8f5d6d9b 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -69,7 +69,7 @@ void LogMessage(HWND hwnd,const char *str) {
 void ErrorMessage(HWND hwnd,const char *str) {
 	if (!str) return;
 	char buf[1028];
-	wsprintf(buf,"Error - %s\r\n",str);
+	wsprintf(buf,"[Error] %s\r\n",str);
 	LogMessage(hwnd,buf);
 }
 
diff --git a/Contrib/Makensisw/version.cpp b/Contrib/Makensisw/version.cpp
index 2b614144..3a069784 100644
--- a/Contrib/Makensisw/version.cpp
+++ b/Contrib/Makensisw/version.cpp
@@ -23,7 +23,7 @@
 #define STR(x) REALSTR(x)
 
 #ifdef RELEASE
-const char *NSISW_VERSION = "MakeNSISW Version " STR(RELEASE);
+const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE);
 #else
-const char *NSISW_VERSION = "MakeNSISW Build: " __DATE__;
+const char *NSISW_VERSION = "MakeNSISW " __DATE__;
 #endif
\ No newline at end of file