diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index 2d89f897..cd703ba7 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -29,16 +29,16 @@
 #undef _RICHEDIT_VER
 
 // Defines
-#define NSIS_URL	"http://www.nullsoft.com/free/nsis/"
+#define NSIS_URL	"http://sourceforge.net/projects/nsis2k/"
 #define USAGE		"Usage:\r\n   makensisw full_path_of_makensis.exe [options] [script.nsi | - [...]]\r\n"
 #define COPYRIGHT	"Copyright (c) 2002 Robert Rainwater"
 #define CONTRIBUTOR	"Portions Copyright (c) 2002 Justin Frankel and Fritz Elfert"
-#define DOCPATH		"http://firehose.net/free/nsis/makensis.htm"
+#define DOCPATH		"http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/nsis2k/NSIS/makensis.htm?rev=HEAD"
 #define REGSEC		HKEY_LOCAL_MACHINE
 #define REGKEY		"Software\\NSIS"
 #define REGLOC		"MakeNSISWPlacement"
 #define MAX_STRING	256
-#define TIMEOUT		200
+#define TIMEOUT		800
 #define MINWIDTH	350
 #define MINHEIGHT	180
 
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index f9674014..ce79fd93 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -32,7 +32,7 @@ void SetTitle(HWND hwnd,char *substr) {
 }
 
 void SetBranding(HWND hwnd) {
-	char title[64];
+	char title[16];
 	wsprintf(title,"MakeNSISW %s",NSISW_VERSION);
 	SetDlgItemText(hwnd, IDC_VERSION, title);
 }
@@ -89,7 +89,6 @@ void LogMessage(HWND hwnd,const char *str) {
 }
 
 
-
 void ErrorMessage(HWND hwnd,const char *str) {
 	if (!str) return;
 	char buf[1028];
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 3ba88135..04c02215 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -108,7 +108,7 @@ Section "Start Menu + Desktop Icons" SecIcons
   SectionIn 1 2 3
   SetOutPath $SMPROGRAMS\NSIS
   Delete "$SMPROGRAMS\NSIS\NSIS Home Page.lnk"
-  WriteINIStr "$SMPROGRAMS\NSIS\NSIS Home Page.url" "InternetShortcut" "URL" "http://www.nullsoft.com/free/nsis/"
+  WriteINIStr "$SMPROGRAMS\NSIS\NSIS Home Page.url" "InternetShortcut" "URL" "http://sourceforge.net/projects/nsis2k/"
   CreateShortCut "$SMPROGRAMS\NSIS\Uninstall NSIS.lnk" "$INSTDIR\uninst-nsis.exe"
   CreateShortCut "$SMPROGRAMS\NSIS\NSIS Documentation.lnk" "$INSTDIR\makensis.htm"
   CreateShortCut "$SMPROGRAMS\NSIS\NSIS Program Directory.lnk" "$INSTDIR"