diff --git a/ChangeLog b/ChangeLog
index fd20223..be08001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes since 1.1
+- Added PKZIP spanning support
+- Added AES encryption support
+- Clean up & changed unzLocateFile to support custom comparison function
+- Clean up, removed zipRemoveExtraInfoBlock
+
+  Credits
+
+    Nathan Moinvaziri
+
 Change in 1.1
 - Added ZIP64 support for unzip ( by Even Rouault )
 - Added ZIP64 support for zip ( by Mathias Svensson )
@@ -6,15 +16,47 @@ Change in 1.1
 - Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
 - Added BZIP Compress method for zip
 - Did some refactoring and code cleanup
-
+   
  Credits
  
   Gilles Vollant    - Original MiniZip author
   Even Rouault      - ZIP64 unzip Support
-  Daniel Borca      - BZip Compression method support in unzip
-  Mathias Svensson  - ZIP64 zip support
-  Mathias Svensson  - BZip Compression method support in zip
 
+   2007-2008
+    - Addition of cpl_unzGetCurrentFileZStreamPos
+    - Decoration of symbol names unz* -> cpl_unz*
+    - Remove old C style function prototypes
+    - Add unzip support for ZIP64
+   
+  Daniel Borca      - BZip Compression method support in unzip
+  Mathias Svensson  - ZIP64 zip support ( http://result42.com )
+
+   Oct-2009 unzip.c
+    - Removed cpl_* from symbol names
+    - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+      should only read the compressed/uncompressed size from the Zip64 format if
+      the size from normal header was 0xffffffff
+    - Applied some bug fixes from patches received from Gilles Vollant
+    - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required)
+      Patch created by Daniel Borca
+
+   Oct-2009 zip.c
+    - Remove old C style function prototypes
+    - Added Zip64 Support when creating new file archives
+    - Did some code cleanup and refactoring to get better overview of some functions.
+    - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+      It is used when recreting zip archive with RAW when deleting items from a zip.
+      ZIP64 data is automaticly added to items that needs it, and existing ZIP64
+      data need to be removed.
+    - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   
+   Oct-2009 ioapi.x
+    - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. 
+    - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+      More if/def section may be needed to support other platforms
+    - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+     (but you should use iowin32.c for windows instead)
+              
 Change in 1.01e (12 feb 05)
 - Fix in zipOpen2 for globalcomment (Rolf Kalbermatter)
 - Fix possible memory leak in unzip.c (Zoran Stevanovic)
diff --git a/README.md b/README.md
index 038856a..db18b81 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ It also has the latest bug fixes that having been found all over the internet in
 
 *AES Encryption*
 
-+ Requires all files in the aes folder
 + Requires #define HAVE_AES
++ Requires AES library files
 
 When using the zip library with password protection it will use AES 256-bit encryption. 
 When using the unzip library it will automatically use AES when applicable. 
@@ -59,6 +59,7 @@ unzOpen2(filename, &filefunc32);
 *BZIP2*
 
 + Requires #define HAVE_BZIP2
++ Requires BZIP2 library
 
 *Windows RT*
 
diff --git a/crypt.h b/crypt.h
index 4bfc121..46c63fb 100644
--- a/crypt.h
+++ b/crypt.h
@@ -1,19 +1,24 @@
 /* crypt.h -- base code for traditional PKWARE encryption
-
-
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+   Modifications for Info-ZIP crypting
+     Copyright (C) 2003 Terry Thorsen
 
-   This code is a modified version of crypting code in Infozip distribution
+   This code is a modified version of crypting code in Info-ZIP distribution
+
+   Copyright (C) 1990-2000 Info-ZIP.  All rights reserved.
+
+   See the Info-ZIP LICENSE file version 2000-Apr-09 or later for terms of use
+   which also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
 
    The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
+   non-echoing password parts) were originally written in Europe. The
    whole source package can be freely distributed, including from the USA.
    (Prior to January 2000, re-export from the US was a violation of US law.)
 
    This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   Roger Schlafly, described by Phil Katz in the file appnote.txt. This
    file (appnote.txt) is distributed with the PKZIP program (even in the
    version without encryption capabilities).
 
diff --git a/ioapi.c b/ioapi.c
index f01f0f0..4b2bead 100644
--- a/ioapi.c
+++ b/ioapi.c
@@ -1,10 +1,14 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #include <stdlib.h>
@@ -252,7 +256,7 @@ static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
     return ret;
 }
 
-static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
+static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
 {
     FILE_IOPOSIX *ioposix = NULL;
     int fseek_origin = 0;
@@ -281,7 +285,7 @@ static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offs
     return ret;
 }
 
-static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
 {
     FILE_IOPOSIX *ioposix = NULL;
     int fseek_origin = 0;
diff --git a/ioapi.h b/ioapi.h
index 6c31538..34d2258 100644
--- a/ioapi.h
+++ b/ioapi.h
@@ -1,39 +1,32 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-   Changes
-
-   Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
-   Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
-              More if/def section may be needed to support other platforms
-   Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
-              (but you should use iowin32.c for windows instead)
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-    /* Linux needs this to support file operation on files larger then 4+GB
-       But might need better if/def to select just the platforms that needs them. */
-    #ifndef __USE_FILE_OFFSET64
-        #define __USE_FILE_OFFSET64
-    #endif
-    #ifndef __USE_LARGEFILE64
-        #define __USE_LARGEFILE64
-    #endif
-    #ifndef _LARGEFILE64_SOURCE
-        #define _LARGEFILE64_SOURCE
-    #endif
-    #ifndef _FILE_OFFSET_BIT
-        #define _FILE_OFFSET_BIT 64
-    #endif
+#  ifndef __USE_FILE_OFFSET64
+#    define __USE_FILE_OFFSET64
+#  endif
+#  ifndef __USE_LARGEFILE64
+#    define __USE_LARGEFILE64
+#  endif
+#  ifndef _LARGEFILE64_SOURCE
+#    define _LARGEFILE64_SOURCE
+#  endif
+#  ifndef _FILE_OFFSET_BIT
+#    define _FILE_OFFSET_BIT 64
+#  endif
 #endif
 
 #include <stdio.h>
@@ -41,42 +34,41 @@
 #include "zlib.h"
 
 #if defined(USE_FILE32API)
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
+#  define fopen64 fopen
+#  define ftello64 ftell
+#  define fseeko64 fseek
 #else
-#ifdef __FreeBSD__
-#define fopen64 fopen
-#define ftello64 ftello
-#define fseeko64 fseeko
-#endif
-#ifdef _MSC_VER
-    #define fopen64 fopen
-    #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
-        #define ftello64 _ftelli64
-        #define fseeko64 _fseeki64
-    #else // old MSC
-        #define ftello64 ftell
-        #define fseeko64 fseek
-    #endif
-#endif
+#  ifdef __FreeBSD__
+#    define fopen64 fopen
+#    define ftello64 ftello
+#    define fseeko64 fseeko
+#  endif
+#  ifdef _MSC_VER
+#    define fopen64 fopen
+#    if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+#      define ftello64 _ftelli64
+#      define fseeko64 _fseeki64
+#    else // old MSC
+#      define ftello64 ftell
+#      define fseeko64 fseek
+#    endif
+#  endif
 #endif
 
 /* a type choosen by DEFINE */
 #ifdef HAVE_64BIT_INT_CUSTOM
-typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T;
 #else
-#ifdef HAS_STDINT_H
-#include "stdint.h"
-typedef uint64_t ZPOS64_T;
-#else
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 ZPOS64_T;
-#else
-typedef unsigned long long int ZPOS64_T;
-#endif
-#endif
+#  ifdef HAS_STDINT_H
+#    include "stdint.h"
+     typedef uint64_t ZPOS64_T;
+#  else
+#    if defined(_MSC_VER) || defined(__BORLANDC__)
+       typedef unsigned __int64 ZPOS64_T;
+#    else
+       typedef unsigned long long int ZPOS64_T;
+#    endif
+#  endif
 #endif
 
 #ifdef __cplusplus
@@ -87,20 +79,20 @@ extern "C" {
 #define ZLIB_FILEFUNC_SEEK_END (2)
 #define ZLIB_FILEFUNC_SEEK_SET (0)
 
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+#define ZLIB_FILEFUNC_MODE_READ             (1)
+#define ZLIB_FILEFUNC_MODE_WRITE            (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER  (3)
 
 #define ZLIB_FILEFUNC_MODE_EXISTING (4)
 #define ZLIB_FILEFUNC_MODE_CREATE   (8)
 
 #ifndef ZCALLBACK
-    #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || \
-         defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-        #define ZCALLBACK CALLBACK
-    #else
-        #define ZCALLBACK
-    #endif
+#  if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || \
+       defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+#    define ZCALLBACK CALLBACK
+#  else
+#    define ZCALLBACK
+#  endif
 #endif
 
 typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
diff --git a/ioapi_buf.c b/ioapi_buf.c
index ae6f483..521a6d9 100644
--- a/ioapi_buf.c
+++ b/ioapi_buf.c
@@ -3,14 +3,11 @@
 
    This version of ioapi is designed to buffer IO.
 
-   Based on Unzip ioapi.c version 0.22, May 19th, 2003
-
    Copyright (C) 1998-2003 Gilles Vollant
-             (C) 2003 Justin Fletcher
-             (C) 2012 Nathan Moinvaziri
+             (C) 2012-2014 Nathan Moinvaziri
 
-   This file is under the same license as the Unzip tool it is distributed
-   with.
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 
diff --git a/ioapi_buf.h b/ioapi_buf.h
index 9b2e94f..7424294 100644
--- a/ioapi_buf.h
+++ b/ioapi_buf.h
@@ -3,14 +3,11 @@
 
    This version of ioapi is designed to buffer IO.
 
-   Based on Unzip ioapi.c version 0.22, May 19th, 2003
-
    Copyright (C) 1998-2003 Gilles Vollant
-             (C) 2003 Justin Fletcher
-             (C) 2012 Nathan Moinvaziri
+             (C) 2012-2014 Nathan Moinvaziri
 
-   This file is under the same license as the Unzip tool it is distributed
-   with.
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 
diff --git a/ioapi_mem.h b/ioapi_mem.h
index 3f61924..b9a70d1 100644
--- a/ioapi_mem.h
+++ b/ioapi_mem.h
@@ -6,16 +6,13 @@
    not have auto-extending buffers and do not inform anyone else that the
    data has been written. It is really intended for accessing a zip archive
    embedded in an application such that I can write an installer with no
-   external files. Creation of archives has not been attempted, although
-   parts of the framework are present.
-
-   Based on Unzip ioapi.c version 0.22, May 19th, 2003
+   external files.
 
    Copyright (C) 1998-2003 Gilles Vollant
              (C) 2003 Justin Fletcher
 
-   This file is under the same license as the Unzip tool it is distributed
-   with.
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 
diff --git a/iowin32.c b/iowin32.c
index 39f2bc4..463a82d 100644
--- a/iowin32.c
+++ b/iowin32.c
@@ -1,11 +1,15 @@
 /* iowin32.c -- IO base function header for compress/uncompress .zip
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #include <stdlib.h>
diff --git a/iowin32.h b/iowin32.h
index e4a1b3e..1732bfa 100644
--- a/iowin32.h
+++ b/iowin32.h
@@ -1,11 +1,15 @@
 /* iowin32.h -- IO base function header for compress/uncompress .zip
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #include <windows.h>
diff --git a/miniunz.c b/miniunz.c
index f534d70..1a16f64 100644
--- a/miniunz.c
+++ b/miniunz.c
@@ -1,15 +1,17 @@
-/*
-   miniunz.c
+/* miniunz.c
    Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   sample part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications of Unzip for Zip64
-   Copyright (C) 2007-2008 Even Rouault
+     Copyright (C) 2007-2008 Even Rouault
+   Modifications for Zip64 support
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   Modifications for Zip64 support on both zip and unzip
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
diff --git a/minizip.c b/minizip.c
index be7a900..c95e588 100644
--- a/minizip.c
+++ b/minizip.c
@@ -1,15 +1,17 @@
-/*
-   minizip.c
+/* minizip.c
    Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   sample part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications of Unzip for Zip64
-   Copyright (C) 2007-2008 Even Rouault
+     Copyright (C) 2007-2008 Even Rouault
+   Modifications for Zip64 support
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   Modifications for Zip64 support on both zip and unzip
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
diff --git a/unzip.c b/unzip.c
index a8bb91e..099cffb 100644
--- a/unzip.c
+++ b/unzip.c
@@ -1,64 +1,19 @@
 /* unzip.c -- IO for uncompress .zip files using zlib
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications of Unzip for Zip64
-   Copyright (C) 2007-2008 Even Rouault
-
+     Copyright (C) 2007-2008 Even Rouault
    Modifications for Zip64 support on both zip and unzip
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-   ------------------------------------------------------------------------------------
-   Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-   compatibility with older software. The following is from the original crypt.c.
-   Code woven in by Terry Thorsen 1/2003.
-
-   Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-   See the accompanying file LICENSE, version 2000-Apr-09 or later
-   (the contents of which are also included in zip.h) for terms of use.
-   If, for some reason, all these files are missing, the Info-ZIP license
-   also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-
-        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   ------------------------------------------------------------------------------------
-
-   Changes in unzip.c
-
-   2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
-   2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
-   2007-2008 - Even Rouault - Remove old C style function prototypes
-   2007-2008 - Even Rouault - Add unzip support for ZIP64
-
-   Copyright (C) 2007-2008 Even Rouault
-
-   Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names
-   Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
-                                 should only read the compressed/uncompressed size from the Zip64 format if
-                                 the size from normal header was 0xffffffff
-   Oct-2009 - Mathias Svensson - Applied some bug fixes from patches received from Gilles Vollant
-   Oct-2009 - Mathias Svensson - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required)
-                                 Patch created by Daniel Borca
-   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-   Aug-2010 - Nathan Moinvaziri - Added PKZIP spanning support
-   May-2012 - Nathan Moinvaziri - Added AES encryption support
-   Jul-2012 - Nathan Moinvaziri - Clean up & changed unzLocateFile to support custom comparison function
-
-   Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+   Modifications for AES, PKWARE disk spanning
+     Copyright (C) 2010-2014 Nathan Moinvaziri
 
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #include <stdio.h>
diff --git a/unzip.h b/unzip.h
index 4145210..22c830f 100644
--- a/unzip.h
+++ b/unzip.h
@@ -1,40 +1,21 @@
 /* unzip.h -- IO for uncompress .zip files using zlib
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications of Unzip for Zip64
-   Copyright (C) 2007-2008 Even Rouault
-
+     Copyright (C) 2007-2008 Even Rouault
    Modifications for Zip64 support on both zip and unzip
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   ---------------------------------------------------------------------------------
-
-   Condition of use and distribution are the same than zlib :
-
-   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.
-
-   --------------------------------------------------------------------------------- 
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-#ifndef _unz64_H
-#define _unz64_H
+#ifndef _UNZ_H
+#define _UNZ_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -332,4 +313,4 @@ extern int ZEXPORT unzeof OF((unzFile file));
 }
 #endif
 
-#endif /* _unz64_H */
+#endif /* _UNZ_H */
diff --git a/zip.c b/zip.c
index bc39543..31d5670 100644
--- a/zip.c
+++ b/zip.c
@@ -1,31 +1,17 @@
 /* zip.c -- IO on .zip files using zlib
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-   For more info read MiniZip_info.txt
-
-   ------------------------------------------------------------------------------------
-
-   Changes in zip.c
-
-   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
-   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
-   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
-   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
-                                 It is used when recreting zip archive with RAW when deleting items from a zip.
-                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64
-                                 data need to be removed.
-   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
-   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-   Aug-2010 - Nathan Moinvaziri - Added PKZIP spanning support
-   May-2012 - Nathan Moinvaziri - Added AES encryption support
-   Jul-2012 - Nathan Moinvaziri - Clean up, removed zipRemoveExtraInfoBlock
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+   Modifications for AES, PKWARE disk spanning
+     Copyright (C) 2010-2014 Nathan Moinvaziri
 
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
 #include <stdio.h>
diff --git a/zip.h b/zip.h
index 596be93..3f3a30b 100644
--- a/zip.h
+++ b/zip.h
@@ -1,37 +1,19 @@
 /* zip.h -- IO on .zip files using zlib
    Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-   Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
    Modifications for Zip64 support
-   Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   ---------------------------------------------------------------------------
-
-   Condition of use and distribution are the same than zlib :
-
-   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.
-
-   ---------------------------------------------------------------------------
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-#ifndef _zip12_H
-#define _zip12_H
+#ifndef _ZIP_H
+#define _ZIP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -215,4 +197,4 @@ extern int ZEXPORT zipClose OF((zipFile file, const char* global_comment));
 }
 #endif
 
-#endif /* _zip64_H */
+#endif /* _ZIP_H */