diff --git a/Contrib/Makensisw/toolbar.bmp b/Contrib/Makensisw/toolbar.bmp
new file mode 100644
index 00000000..1f821293
Binary files /dev/null and b/Contrib/Makensisw/toolbar.bmp differ
diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp
new file mode 100644
index 00000000..a3e09bea
--- /dev/null
+++ b/Contrib/Makensisw/toolbar.cpp
@@ -0,0 +1,221 @@
+/* 
+  Copyright (c) 2003 Sunil Kamath
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+#include <windows.h>
+#include "resource.h"
+#include "makensisw.h"
+#include "noclib.h"
+#include "toolbar.h"
+
+NTOOLBAR g_toolbar;
+extern NSCRIPTDATA g_sdata;
+extern NTOOLTIP g_tip;
+
+TBBUTTON CreateToolBarButton(int iBitmap, int idCommand, BYTE fsState, BYTE fsStyle, DWORD dwData, int iString)
+{
+	TBBUTTON tbButton;
+	tbButton.iBitmap = iBitmap;
+	tbButton.idCommand = idCommand;
+	tbButton.fsState = fsState;
+	tbButton.fsStyle = fsStyle;
+	tbButton.dwData = dwData;
+	tbButton.iString = iString;
+
+	return tbButton;
+}
+
+void CreateToolBar()
+{ 
+	static TBBUTTON tbButton[BUTTONCOUNT];
+    tbButton[TBB_LOADSCRIPT]  = CreateToolBarButton(IDB_LOADSCRIPT,    IDM_LOADSCRIPT, TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_SAVE]        = CreateToolBarButton(IDB_SAVE,          IDM_SAVE,       TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_EXIT]        = CreateToolBarButton(IDB_EXIT,          IDM_EXIT,       TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_SEP1]        = CreateToolBarButton(0,                 0,	           TBSTATE_ENABLED,        TBSTYLE_SEP,      0, 0);
+    tbButton[TBB_COPY]        = CreateToolBarButton(IDB_COPY,          IDM_COPY,       TBSTATE_INDETERMINATE,  TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_FIND]        = CreateToolBarButton(IDB_FIND,          IDM_FIND,       TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_SEP2]        = CreateToolBarButton(0,                 0,	           TBSTATE_ENABLED,        TBSTYLE_SEP,      0, 0);
+    tbButton[TBB_RECOMPILE]   = CreateToolBarButton(IDB_RECOMPILE,     IDM_RECOMPILE,  TBSTATE_INDETERMINATE,  TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_DEFINES]     = CreateToolBarButton(IDB_DEFINES,       IDM_DEFINES,    TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+#ifdef COMPRESSOR_OPTION
+    tbButton[TBB_COMPRESSOR]  = CreateToolBarButton(IDB_COMPRESSOR,    IDM_COMPRESSOR, TBSTATE_ENABLED,        TBSTYLE_DROPDOWN, 0, 0);
+#endif
+    tbButton[TBB_TEST]        = CreateToolBarButton(IDB_TEST,          IDM_TEST,       TBSTATE_INDETERMINATE,  TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_EDITSCRIPT]  = CreateToolBarButton(IDB_EDITSCRIPT,    IDM_EDITSCRIPT, TBSTATE_INDETERMINATE,  TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_BROWSESCR]   = CreateToolBarButton(IDB_BROWSESCR,     IDM_BROWSESCR,  TBSTATE_INDETERMINATE,  TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_CLEARLOG]    = CreateToolBarButton(IDB_CLEARLOG,      IDM_CLEARLOG,   TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_SEP3]        = CreateToolBarButton(0,                 0,	           TBSTATE_ENABLED,        TBSTYLE_SEP,      0, 0);
+    tbButton[TBB_NSISHOME]    = CreateToolBarButton(IDB_NSISHOME,      IDM_NSISHOME,   TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_NSISDEV]     = CreateToolBarButton(IDB_NSISDEV,       IDM_NSISDEV,    TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_FORUM]       = CreateToolBarButton(IDB_FORUM,         IDM_FORUM,      TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_NSISUPDATE]  = CreateToolBarButton(IDB_NSISUPDATE,    IDM_NSISUPDATE, TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+    tbButton[TBB_SEP4]        = CreateToolBarButton(0,                0,	           TBSTATE_ENABLED,        TBSTYLE_SEP,      0, 0);
+    tbButton[TBB_DOCS]        = CreateToolBarButton(IDB_DOCS,          IDM_DOCS,       TBSTATE_ENABLED,        TBSTYLE_BUTTON,   0, 0);
+
+    g_toolbar.hwnd = CreateToolbarEx(g_sdata.hwnd,
+ 	                                 WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT,
+                                     TOOLBAR_ID,
+                                     NUMIMAGES,
+                                     g_sdata.hInstance,
+                                     IDB_TOOLBAR,
+                                     tbButton,
+                                     BUTTONCOUNT,
+                                     BUTTONWIDTH,
+                                     BUTTONHEIGHT,
+                                     IMAGEWIDTH,
+                                     IMAGEHEIGHT,
+                                     sizeof(TBBUTTON));
+#ifdef COMPRESSOR_OPTION
+    SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS);
+    HMENU toolmenu = GetSubMenu(g_sdata.menu, 2);
+    g_toolbar.dropdownmenu = GetSubMenu(toolmenu,2);
+	RECT rect;
+	SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, TBB_COMPRESSOR, (LPARAM) (LPRECT) &rect);
+    g_toolbar.dropdownpoint.x = rect.left;
+    g_toolbar.dropdownpoint.y = rect.bottom+1;
+#endif
+}
+
+#ifdef COMPRESSOR_OPTION
+void UpdateToolBarCompressorButton()
+{
+	int iBitmap;
+	int iString;
+    char   szBuffer[64];
+    char   temp[32];
+	TOOLINFO ti;
+
+	my_memset(&ti, 0, sizeof(TOOLINFO));
+
+	switch(g_sdata.compressor) {
+	case COMPRESSOR_DEFAULT:
+		iBitmap = IDB_COMPRESSOR;
+		iString = IDS_DEFAULT;
+		break;
+	case COMPRESSOR_ZLIB:
+		iBitmap = IDB_COMPRESSOR_ZLIB;
+		iString = IDS_ZLIB;
+		break;
+	case COMPRESSOR_GZIP:
+		iBitmap = IDB_COMPRESSOR_GZIP;
+		iString = IDS_GZIP;
+		break;
+	default:
+		return;
+	}
+    LoadString(g_sdata.hInstance,
+               IDS_COMPRESSOR,
+               temp,
+               sizeof(temp));
+	my_memset(szBuffer, 0, sizeof(szBuffer));
+	lstrcat(szBuffer,temp);
+	lstrcat(szBuffer," (");
+    LoadString(g_sdata.hInstance,
+               iString,
+               temp,
+               sizeof(temp));
+	lstrcat(szBuffer,temp);
+	lstrcat(szBuffer,")");
+
+	SendMessage(g_toolbar.hwnd, TB_CHANGEBITMAP, (WPARAM) IDM_COMPRESSOR, (LPARAM) MAKELPARAM(iBitmap, 0));
+
+    ti.cbSize = sizeof(TOOLINFO); 
+    ti.uFlags = 0; 
+    ti.hinst = g_sdata.hInstance; 
+    ti.hwnd = g_toolbar.hwnd; 
+    ti.uId = (UINT)TBB_COMPRESSOR;
+    SendMessage(g_tip.tip, TTM_GETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); 
+	ti.lpszText = (LPSTR)szBuffer;
+    SendMessage(g_tip.tip, TTM_SETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); 
+}
+#endif
+
+void AddToolBarButtonTooltip(int id, int iString)
+{
+	TOOLINFO ti;
+    char   szBuffer[64];
+	RECT rect;
+
+	my_memset(&ti, 0, sizeof(TOOLINFO));
+
+	SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, id, (LPARAM) (LPRECT) &rect);
+
+    ti.cbSize = sizeof(TOOLINFO); 
+    ti.uFlags = 0; 
+    ti.hwnd = g_toolbar.hwnd; 
+    ti.hinst = g_sdata.hInstance; 
+    ti.uId = (UINT)id; 
+
+    LoadString(g_sdata.hInstance,
+               iString,
+               szBuffer,
+               sizeof(szBuffer));
+    ti.lpszText = (LPSTR) szBuffer; 
+    ti.rect.left =rect.left; 
+    ti.rect.top = rect.top; 
+    ti.rect.right = rect.right; 
+    ti.rect.bottom = rect.bottom; 
+
+    SendMessage(g_tip.tip, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); 
+}
+
+void AddToolBarTooltips()
+{
+    AddToolBarButtonTooltip(TBB_LOADSCRIPT, IDS_LOADSCRIPT);
+    AddToolBarButtonTooltip(TBB_SAVE, IDS_SAVE);
+    AddToolBarButtonTooltip(TBB_EXIT, IDS_EXIT);
+    AddToolBarButtonTooltip(TBB_COPY, IDS_COPY);
+    AddToolBarButtonTooltip(TBB_FIND, IDS_FIND);
+    AddToolBarButtonTooltip(TBB_RECOMPILE, IDS_RECOMPILE);
+    AddToolBarButtonTooltip(TBB_DEFINES, IDS_DEFINES);
+#ifdef COMPRESSOR_OPTION
+    AddToolBarButtonTooltip(TBB_COMPRESSOR, IDS_COMPRESSOR);
+#endif
+    AddToolBarButtonTooltip(TBB_TEST, IDS_TEST);
+    AddToolBarButtonTooltip(TBB_EDITSCRIPT, IDS_EDITSCRIPT);
+    AddToolBarButtonTooltip(TBB_BROWSESCR, IDS_BROWSESCR);
+    AddToolBarButtonTooltip(TBB_CLEARLOG, IDS_CLEARLOG);
+    AddToolBarButtonTooltip(TBB_NSISHOME, IDS_NSISHOME);
+    AddToolBarButtonTooltip(TBB_NSISDEV, IDS_NSISDEV);
+    AddToolBarButtonTooltip(TBB_FORUM, IDS_FORUM);
+    AddToolBarButtonTooltip(TBB_NSISUPDATE, IDS_NSISUPDATE);
+    AddToolBarButtonTooltip(TBB_DOCS, IDS_DOCS);
+}
+
+void EnableToolBarButton(int id, BOOL enabled)
+{
+	UINT state = (enabled?TBSTATE_ENABLED:TBSTATE_INDETERMINATE);
+	
+	SendMessage(g_toolbar.hwnd, TB_SETSTATE, id, MAKELPARAM(state, 0));
+}
+
+#ifdef COMPRESSOR_OPTION
+void ShowToolbarDropdownMenu()
+{
+	RECT rect;
+	GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect);
+    TrackPopupMenu(g_toolbar.dropdownmenu,
+                   NULL,
+                   rect.left + (int)(short)g_toolbar.dropdownpoint.x,
+                   rect.top + (int)(short)g_toolbar.dropdownpoint.y,
+                   0,
+                   g_sdata.hwnd,
+                   0);
+}
+#endif
\ No newline at end of file
diff --git a/Contrib/Makensisw/toolbar.h b/Contrib/Makensisw/toolbar.h
new file mode 100644
index 00000000..29b2279e
--- /dev/null
+++ b/Contrib/Makensisw/toolbar.h
@@ -0,0 +1,96 @@
+/* 
+  Copyright (c) 2003 Sunil Kamath
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+*/
+#ifndef TOOLBAR_H
+#define TOOLBAR_H
+#include <commctrl.h> 
+
+#define TOOLBAR_ID                   10001
+
+#define NUMIMAGES       19
+#define IMAGEWIDTH      16
+#define IMAGEHEIGHT     16
+#define BUTTONWIDTH     0
+#define BUTTONHEIGHT    0
+
+#define BUTTONCOUNT     21
+
+#define TBB_LOADSCRIPT                   0
+#define TBB_SAVE                         1
+#define TBB_EXIT                         2
+#define TBB_SEP1                         3
+#define TBB_COPY                         4
+#define TBB_FIND                         5
+#define TBB_SEP2                         6
+#define TBB_RECOMPILE                    7
+#define TBB_DEFINES                      8
+#ifdef COMPRESSOR_OPTION
+#define TBB_COMPRESSOR                   9
+#endif
+#define TBB_TEST                         10
+#define TBB_EDITSCRIPT                   11
+#define TBB_BROWSESCR                    12
+#define TBB_CLEARLOG                     13
+#define TBB_SEP3                         14
+#define TBB_NSISHOME                     15
+#define TBB_NSISDEV                      16
+#define TBB_FORUM                        17
+#define TBB_NSISUPDATE                   18
+#define TBB_SEP4                         19
+#define TBB_DOCS                         20
+
+#define IDB_LOADSCRIPT                   0
+#define IDB_SAVE                         1
+#define IDB_EXIT                         2
+#define IDB_COPY                         3
+#define IDB_FIND                         4
+#define IDB_RECOMPILE                    5
+#define IDB_DEFINES                      6
+#ifdef COMPRESSOR_OPTION
+#define IDB_COMPRESSOR                   7
+#endif
+#define IDB_TEST                         8
+#define IDB_EDITSCRIPT                   9
+#define IDB_BROWSESCR                    10
+#define IDB_CLEARLOG                     11
+#define IDB_NSISHOME                     12
+#define IDB_NSISDEV                      13
+#define IDB_FORUM                        14
+#define IDB_NSISUPDATE                   15
+#define IDB_DOCS                         16
+#ifdef COMPRESSOR_OPTION
+#define IDB_COMPRESSOR_ZLIB              17
+#define IDB_COMPRESSOR_GZIP              18
+#endif
+
+typedef struct ToolBarStruct {
+  HWND hwnd;
+  HMENU dropdownmenu;
+  POINT dropdownpoint;
+} NTOOLBAR;
+
+void CreateToolBar();
+void EnableToolBarButton(int, BOOL);
+void AddToolBarTooltips();
+#ifdef COMPRESSOR_OPTION
+void ShowToolbarDropdownMenu();
+void UpdateToolBarCompressorButton();
+#endif
+#endif
\ No newline at end of file