diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 85c7c9c0..b4088f04 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -1,7 +1,11 @@
-/*
-  Nullsoft "SuperPimp" Installation System - main.c - executable header main code
+/* 
+
+  Nullsoft Scriptable Install System (NSIS)
+  main.c - executable header main code
 
   Copyright (C) 1999-2004 Nullsoft, Inc.
+  
+  This license applies to everything in the NSIS package, except where otherwise noted.
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -19,10 +23,13 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-  This source distribution includes portions of zlib. see zlib/zlib.h for
-  its license and so forth. Note that this license is also borrowed from zlib.
-*/
+  This is the zlib/libpng license, which is approved by opensource.org.
 
+  Portions Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler (zlib).
+  Portions Copyright (C) 1996-2002 Julian R Seward (bzip2).
+  Portions Copyright (C) 1999-2003 Igor Pavlov (lzma).
+
+*/
 
 #include "../Platform.h"
 #include <shlobj.h>
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index c0f9a98a..4bed2493 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -1,10 +1,13 @@
 const char *NSIS_VERSION="v2.0";
 
 /* 
+
   Nullsoft Scriptable Install System (NSIS)
   makensis.cpp - installer compiler code
 
   Copyright (C) 1999-2004 Nullsoft, Inc.
+  
+  This license applies to everything in the NSIS package, except where otherwise noted.
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -25,7 +28,9 @@ const char *NSIS_VERSION="v2.0";
   This is the zlib/libpng license, which is approved by opensource.org.
 
   Portions Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler (zlib).
-  Includes portions derived from bzip2 (see documentation for details).
+  Portions Copyright (C) 1996-2002 Julian R Seward (bzip2).
+  Portions Copyright (C) 1999-2003 Igor Pavlov (lzma).
+
 */
 
 #include "Platform.h"
@@ -112,8 +117,9 @@ int main(int argc, char **argv)
     fprintf(g_output,"MakeNSIS %s - Copyright 1999-2004 Nullsoft, Inc.\n"
            "\n"
            "Portions Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler (zlib).\n"
-           "Includes portions derived from bzip2 (see documentation for details).\n"
+           "Portions Copyright (C) 1996-2002 Julian R Seward (bzip2).\n"
            "Portions Copyright (C) 1999-2003 Igor Pavlov (lzma).\n"
+           "\n"
            "Contributors: nnop@newmail.ru, Ryan Geiss, Andras Varga, Drew Davidson, Peter Windridge, Dave Laundon, Robert Rainwater, Yaroslav Faybishenko, Jeff Doozan, Amir Szekely, Ximon Eighteen, et al.\n\n",NSIS_VERSION);
     fflush(g_output);
   }
@@ -183,8 +189,10 @@ int main(int argc, char **argv)
     {
       if (build.display_info) 
       {
-        fprintf(g_output,"This software is provided 'as-is', without any express or implied warranty.  In\n"
-             "no event will the authors be held liable for any damages arising from the use\n"
+        fprintf(g_output,"Copyright (C) 1999-2004 Nullsoft, Inc.\n\n"
+             "This license applies to everything in the NSIS package, except where otherwise noted.\n\n"
+             "This software is provided 'as-is', without any express or implied warranty.\n"
+             "In no event will the authors be held liable for any damages arising from the use\n"
              "of this software.\n\n"
              "Permission is granted to anyone to use this software for any purpose, including\n"
              "commercial applications, and to alter it and redistribute it freely, subject to\n"