diff --git a/man/zipcmp.html b/man/zipcmp.html
index b92dd2650..e5189c923 100644
--- a/man/zipcmp.html
+++ b/man/zipcmp.html
@@ -2,7 +2,7 @@
 <html>
 <!-- This is an automatically generated file.  Do not edit.
    zipcmp.mdoc -- compare zip archives
-   Copyright (C) 2003-2022 Dieter Baron and Thomas Klausner
+   Copyright (C) 2003-2024 Dieter Baron and Thomas Klausner
   
    This file is part of libzip, a library to manipulate ZIP archives.
    The authors can be contacted at <info@libzip.org>
@@ -56,7 +56,7 @@ <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a><
 <table class="Nm">
   <tr>
     <td><code class="Nm">zipcmp</code></td>
-    <td>[<code class="Fl">-ChipqstVv</code>] <var class="Ar">archive1
+    <td>[<code class="Fl">-ChipqsTtVv</code>] <var class="Ar">archive1
       archive2</var></td>
   </tr>
 </table>
@@ -84,6 +84,8 @@ <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIP
   <dd>Quiet mode. Compare <code class="Fl">-v</code>.</dd>
   <dt><a class="permalink" href="#s"><code class="Fl" id="s">-s</code></a></dt>
   <dd>Print a summary of how many files where added and removed.</dd>
+  <dt><a class="permalink" href="#T"><code class="Fl" id="T">-T</code></a></dt>
+  <dd>Additionally compare the time stamps of the entries.</dd>
   <dt><a class="permalink" href="#t"><code class="Fl" id="t">-t</code></a></dt>
   <dd>Test zip files by comparing the contents to their checksums.</dd>
   <dt><a class="permalink" href="#V"><code class="Fl" id="V">-V</code></a></dt>
@@ -120,7 +122,7 @@ <h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">March 19, 2022</td>
+    <td class="foot-date">March 15, 2024</td>
     <td class="foot-os">NiH</td>
   </tr>
 </table>
diff --git a/man/zipcmp.man b/man/zipcmp.man
index fed255fb1..cf84ccc02 100644
--- a/man/zipcmp.man
+++ b/man/zipcmp.man
@@ -1,6 +1,6 @@
 .\" Automatically generated from an mdoc input file.  Do not edit.
 .\" zipcmp.mdoc -- compare zip archives
-.\" Copyright (C) 2003-2022 Dieter Baron and Thomas Klausner
+.\" Copyright (C) 2003-2024 Dieter Baron and Thomas Klausner
 .\"
 .\" This file is part of libzip, a library to manipulate ZIP archives.
 .\" The authors can be contacted at <info@libzip.org>
@@ -30,7 +30,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH "ZIPCMP" "1" "March 19, 2022" "NiH" "General Commands Manual"
+.TH "ZIPCMP" "1" "March 15, 2024" "NiH" "General Commands Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -39,7 +39,7 @@
 .SH "SYNOPSIS"
 .HP 7n
 \fBzipcmp\fR
-[\fB\-ChipqstVv\fR]
+[\fB\-ChipqsTtVv\fR]
 \fIarchive1\ archive2\fR
 .SH "DESCRIPTION"
 \fBzipcmp\fR
@@ -78,6 +78,9 @@ Compare
 \fB\-s\fR
 Print a summary of how many files where added and removed.
 .TP 5n
+\fB\-T\fR
+Additionally compare the time stamps of the entries.
+.TP 5n
 \fB\-t\fR
 Test zip files by comparing the contents to their checksums.
 .TP 5n
diff --git a/man/zipcmp.mdoc b/man/zipcmp.mdoc
index 7a22ced2a..d3d69e69b 100644
--- a/man/zipcmp.mdoc
+++ b/man/zipcmp.mdoc
@@ -1,5 +1,5 @@
 .\" zipcmp.mdoc -- compare zip archives
-.\" Copyright (C) 2003-2022 Dieter Baron and Thomas Klausner
+.\" Copyright (C) 2003-2024 Dieter Baron and Thomas Klausner
 .\"
 .\" This file is part of libzip, a library to manipulate ZIP archives.
 .\" The authors can be contacted at <info@libzip.org>
@@ -29,7 +29,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 19, 2022
+.Dd March 15, 2024
 .Dt ZIPCMP 1
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd compare contents of zip archives
 .Sh SYNOPSIS
 .Nm
-.Op Fl ChipqstVv
+.Op Fl ChipqsTtVv
 .Ar archive1 archive2
 .Sh DESCRIPTION
 .Nm
@@ -70,6 +70,8 @@ Compare
 .Fl v .
 .It Fl s
 Print a summary of how many files where added and removed.
+.It Fl T
+Additionally compare the time stamps of the entries.
 .It Fl t
 Test zip files by comparing the contents to their checksums.
 .It Fl V
diff --git a/regress/zipcmp_zip_dir.test b/regress/zipcmp_zip_dir.test
index 8233b80c2..33e91588b 100644
--- a/regress/zipcmp_zip_dir.test
+++ b/regress/zipcmp_zip_dir.test
@@ -11,7 +11,7 @@ stdout
 --- zipcmp_zip_dir.zip
 +++ a
 - directory '00-empty-dir/'
-- file 'dir-with-file/a', size 1, crc e8b7be43
+- file 'dir-with-file/a', size 1, crc e8b7be43, mtime 0
 + directory 'empty-dir-in-dir/'
 - directory 'empty-dir/'
 end-of-inline-data
diff --git a/src/diff_output.c b/src/diff_output.c
index 96b6313b1..003b5e135 100644
--- a/src/diff_output.c
+++ b/src/diff_output.c
@@ -7,7 +7,8 @@
 
 #include "compat.h"
 
-static void ensure_header(diff_output_t *output) {
+static void
+ensure_header(diff_output_t *output) {
     if (output->archive_names[0] != NULL) {
         printf("--- %s\n", output->archive_names[0]);
         printf("+++ %s\n", output->archive_names[1]);
@@ -16,26 +17,32 @@ static void ensure_header(diff_output_t *output) {
     }
 }
 
-void diff_output_init(diff_output_t *output, int verbose, char *const archive_names[]) {
+void
+diff_output_init(diff_output_t *output, int verbose, char *const archive_names[]) {
     output->archive_names[0] = archive_names[0];
     output->archive_names[1] = archive_names[1];
     output->verbose = verbose;
     output->file_name = NULL;
     output->file_size = 0;
     output->file_crc = 0;
+    output->file_mtime = 0;
 }
 
-void diff_output_start_file(diff_output_t *output, const char *name, zip_uint64_t size, zip_uint32_t crc) {
+void
+diff_output_start_file(diff_output_t *output, const char *name, zip_uint64_t size, zip_uint32_t crc, zip_uint64_t mtime) {
     output->file_name = name;
     output->file_size = size;
     output->file_crc = crc;
+    output->file_mtime = mtime;
 }
 
-void diff_output_end_file(diff_output_t *output) {
+void
+diff_output_end_file(diff_output_t *output) {
     output->file_name = NULL;
 }
 
-void diff_output(diff_output_t *output, int side, const char *fmt, ...) {
+void
+diff_output(diff_output_t *output, int side, const char *fmt, ...) {
     va_list ap;
 
     if (!output->verbose) {
@@ -43,12 +50,12 @@ void diff_output(diff_output_t *output, int side, const char *fmt, ...) {
     }
 
     ensure_header(output);
-    
+
     if (output->file_name != NULL) {
-        diff_output_file(output, ' ', output->file_name, output->file_size, output->file_crc);
+        diff_output_file(output, ' ', output->file_name, output->file_size, output->file_crc, output->file_mtime);
         output->file_name = NULL;
     }
-    
+
     printf("%c ", side);
     va_start(ap, fmt);
     vprintf(fmt, ap);
@@ -56,23 +63,25 @@ void diff_output(diff_output_t *output, int side, const char *fmt, ...) {
     printf("\n");
 }
 
-void diff_output_file(diff_output_t *output, char side, const char *name, zip_uint64_t size, zip_uint32_t crc) {
+void
+diff_output_file(diff_output_t *output, char side, const char *name, zip_uint64_t size, zip_uint32_t crc, zip_uint64_t mtime) {
     if (!output->verbose) {
         return;
     }
-    
+
     ensure_header(output);
-    
+
     if (size == 0 && crc == 0 && name[0] != '\0' && name[strlen(name) - 1] == '/') {
         printf("%c directory '%s'\n", side, name);
     }
     else {
-        printf("%c file '%s', size %" PRIu64 ", crc %08x\n", side, name, size, crc);
+        printf("%c file '%s', size %" PRIu64 ", crc %08x, mtime %" PRIu64 "\n", side, name, size, crc, mtime);
     }
 }
 
 #define MAX_BYTES 64
-void diff_output_data(diff_output_t *output, int side, const zip_uint8_t *data, zip_uint64_t data_length, const char *fmt, ...) {
+void
+diff_output_data(diff_output_t *output, int side, const zip_uint8_t *data, zip_uint64_t data_length, const char *fmt, ...) {
     char prefix[1024];
     char hexdata[MAX_BYTES * 3 + 6];
     size_t i, offset;
@@ -81,7 +90,7 @@ void diff_output_data(diff_output_t *output, int side, const zip_uint8_t *data,
     if (!output->verbose) {
         return;
     }
-    
+
     offset = 0;
     for (i = 0; i < data_length; i++) {
         hexdata[offset++] = (i == 0 ? '<' : ' ');
@@ -96,11 +105,11 @@ void diff_output_data(diff_output_t *output, int side, const zip_uint8_t *data,
 
     hexdata[offset++] = '>';
     hexdata[offset] = '\0';
-    
+
     va_start(ap, fmt);
     vsnprintf(prefix, sizeof(prefix), fmt, ap);
     va_end(ap);
     prefix[sizeof(prefix) - 1] = '\0';
-    
+
     diff_output(output, side, "%s, length %" PRIu64 ", data %s", prefix, data_length, hexdata);
 }
diff --git a/src/diff_output.h b/src/diff_output.h
index 8ac12b8bb..f04f9310a 100644
--- a/src/diff_output.h
+++ b/src/diff_output.h
@@ -8,6 +8,7 @@ typedef struct {
     const char *file_name;
     zip_uint64_t file_size;
     zip_uint32_t file_crc;
+    zip_uint64_t file_mtime;
     int verbose;
 } diff_output_t;
 
@@ -18,11 +19,11 @@ typedef struct {
 #endif
 
 void diff_output_init(diff_output_t *output, int verbose, char *const archive_names[]);
-void diff_output_start_file(diff_output_t *output, const char *name, zip_uint64_t size, zip_uint32_t crc);
+void diff_output_start_file(diff_output_t *output, const char *name, zip_uint64_t size, zip_uint32_t crc, zip_uint64_t mtime);
 void diff_output_end_file(diff_output_t *output);
 
 void diff_output(diff_output_t *output, int side, const char *fmt, ...) PRINTF_LIKE(3, 4);
 void diff_output_data(diff_output_t *output, int side, const zip_uint8_t *data, zip_uint64_t data_length, const char *fmt, ...) PRINTF_LIKE(5, 6);
-void diff_output_file(diff_output_t *output, char side, const char *name, zip_uint64_t size, zip_uint32_t crc);
+void diff_output_file(diff_output_t *output, char side, const char *name, zip_uint64_t size, zip_uint32_t crc, zip_uint64_t mtime);
 
 #endif /* HAD_DIFF_OUTPUT_H */
diff --git a/src/zipcmp.c b/src/zipcmp.c
index 695c77e42..928d32fe2 100644
--- a/src/zipcmp.c
+++ b/src/zipcmp.c
@@ -79,6 +79,7 @@ struct entry {
     zip_uint64_t size;
     zip_uint32_t crc;
     zip_uint32_t comp_method;
+    time_t last_modification_time;
     struct ef *extra_fields;
     zip_uint16_t n_extra_fields;
     const char *comment;
@@ -88,113 +89,85 @@ struct entry {
 
 typedef struct {
     uint32_t value;
-    const char * const name;
+    const char *const name;
 } enum_map_t;
 
-const enum_map_t comp_methods[] = {
-    { 0, "Stored (no compression)" },
-    { 1, "Shrunk" },
-    { 2, "Reduced with compression factor 1" },
-    { 3, "Reduced with compression factor 2" },
-    { 4, "Reduced with compression factor 3" },
-    { 5, "Reduced with compression factor 4" },
-    { 6, "Imploded" },
-    { 7, "Reserved for Tokenizing compression algorithm" },
-    { 8, "Deflated" },
-    { 9, "Enhanced Deflating using Deflate64(tm)" },
-    { 10, "PKWARE Data Compression Library Imploding (old IBM TERSE)" },
-    { 11, "11 (Reserved by PKWARE)" },
-    { 12, "BZIP2" },
-    { 13, "13 (Reserved by PKWARE)" },
-    { 14, "LZMA (EFS)" },
-    { 15, "15 (Reserved by PKWARE)" },
-    { 16, "16 (Reserved by PKWARE)" },
-    { 17, "17 (Reserved by PKWARE)" },
-    { 18, "IBM TERSE (new)" },
-    { 19, "IBM LZ77 z Architecture (PFS)" },
-    { 20, "Zstandard compressed data (obsolete)" },
-    { 93, "Zstandard compressed data" },
-    { 95, "XZ compressed data" },
-    { 97, "WavPack compressed data" },
-    { 98, "PPMd version I, Rev 1" },
-    { 99, "WinZIP AES Encryption" },
-    { UINT32_MAX, NULL }
-};
+const enum_map_t comp_methods[] = {{0, "Stored (no compression)"}, {1, "Shrunk"}, {2, "Reduced with compression factor 1"}, {3, "Reduced with compression factor 2"}, {4, "Reduced with compression factor 3"}, {5, "Reduced with compression factor 4"}, {6, "Imploded"}, {7, "Reserved for Tokenizing compression algorithm"}, {8, "Deflated"}, {9, "Enhanced Deflating using Deflate64(tm)"}, {10, "PKWARE Data Compression Library Imploding (old IBM TERSE)"}, {11, "11 (Reserved by PKWARE)"}, {12, "BZIP2"}, {13, "13 (Reserved by PKWARE)"}, {14, "LZMA (EFS)"}, {15, "15 (Reserved by PKWARE)"}, {16, "16 (Reserved by PKWARE)"}, {17, "17 (Reserved by PKWARE)"}, {18, "IBM TERSE (new)"}, {19, "IBM LZ77 z Architecture (PFS)"}, {20, "Zstandard compressed data (obsolete)"}, {93, "Zstandard compressed data"}, {95, "XZ compressed data"}, {97, "WavPack compressed data"}, {98, "PPMd version I, Rev 1"}, {99, "WinZIP AES Encryption"}, {UINT32_MAX, NULL}};
 
 const enum_map_t extra_fields[] = {
     /* PKWARE defined */
-    { 0x0001, "Zip64 extended information" },
-    { 0x0007, "AV Info" },
-    { 0x0008, "Reserved for extended language encoding data (PFS)" },
-    { 0x0009, "OS/2" },
-    { 0x000a, "NTFS" },
-    { 0x000c, "OpenVMS" },
-    { 0x000d, "UNIX" },
-    { 0x000e, "Reserved for file stream and fork descriptors" },
-    { 0x000f, "Patch Descriptor" },
-    { 0x0014, "PKCS#7 Store for X.509 Certificates" },
-    { 0x0015, "X.509 Certificate ID and Signature for individual file" },
-    { 0x0016, "X.509 Certificate ID for Central Directory" },
-    { 0x0017, "Strong Encryption Header" },
-    { 0x0018, "Record Management Controls" },
-    { 0x0019, "PKCS#7 Encryption Recipient Certificate List" },
-    { 0x0065, "IBM S/390 (Z390), AS/400 (I400) attributes - uncompressed" },
-    { 0x0066, "Reserved for IBM S/390 (Z390), AS/400 (I400) attributes - compressed" },
-    { 0x4690, "POSZIP 4690 (reserved)" },
+    {0x0001, "Zip64 extended information"},
+    {0x0007, "AV Info"},
+    {0x0008, "Reserved for extended language encoding data (PFS)"},
+    {0x0009, "OS/2"},
+    {0x000a, "NTFS"},
+    {0x000c, "OpenVMS"},
+    {0x000d, "UNIX"},
+    {0x000e, "Reserved for file stream and fork descriptors"},
+    {0x000f, "Patch Descriptor"},
+    {0x0014, "PKCS#7 Store for X.509 Certificates"},
+    {0x0015, "X.509 Certificate ID and Signature for individual file"},
+    {0x0016, "X.509 Certificate ID for Central Directory"},
+    {0x0017, "Strong Encryption Header"},
+    {0x0018, "Record Management Controls"},
+    {0x0019, "PKCS#7 Encryption Recipient Certificate List"},
+    {0x0065, "IBM S/390 (Z390), AS/400 (I400) attributes - uncompressed"},
+    {0x0066, "Reserved for IBM S/390 (Z390), AS/400 (I400) attributes - compressed"},
+    {0x4690, "POSZIP 4690 (reserved)"},
 
     /* Third-Party defined; see InfoZIP unzip sources proginfo/extrafld.txt */
-    { 0x07c8, "Info-ZIP Macintosh (old)" },
-    { 0x2605, "ZipIt Macintosh (first version)" },
-    { 0x2705, "ZipIt Macintosh 1.3.5+ (w/o full filename)" },
-    { 0x2805, "ZipIt Macintosh 1.3.5+" },
-    { 0x334d, "Info-ZIP Macintosh (new)" },
-    { 0x4154, "Tandem NSK" },
-    { 0x4341, "Acorn/SparkFS" },
-    { 0x4453, "Windows NT security descriptor" },
-    { 0x4704, "VM/CMS" },
-    { 0x470f, "MVS" },
-    { 0x4854, "Theos, old unofficial port" },
-    { 0x4b46, "FWKCS MD5" },
-    { 0x4c41, "OS/2 access control list (text ACL)" },
-    { 0x4d49, "Info-ZIP OpenVMS (obsolete)" },
-    { 0x4d63, "Macintosh SmartZIP" },
-    { 0x4f4c, "Xceed original location extra field" },
-    { 0x5356, "AOS/VS (ACL)" },
-    { 0x5455, "extended timestamp" },
-    { 0x554e, "Xceed unicode extra field" },
-    { 0x5855, "Info-ZIP UNIX (original)" },
-    { 0x6375, "Info-ZIP UTF-8 comment field" },
-    { 0x6542, "BeOS (BeBox, PowerMac, etc.)" },
-    { 0x6854, "Theos" },
-    { 0x7075, "Info-ZIP UTF-8 name field" },
-    { 0x7441, "AtheOS (AtheOS/Syllable attributes)" },
-    { 0x756e, "ASi UNIX" },
-    { 0x7855, "Info-ZIP UNIX" },
-    { 0x7875, "Info-ZIP UNIX 3rd generation" },
-    { 0x9901, "WinZIP AES encryption" },
-    { 0xa220, "Microsoft Open Packaging Growth Hint" },
-    { 0xcafe, "executable Java JAR file" },
-    { 0xfb4a, "SMS/QDOS" }, /* per InfoZIP extrafld.txt */
-    { 0xfd4a, "SMS/QDOS" }, /* per appnote.txt */
-    { UINT32_MAX, NULL }
-};
+    {0x07c8, "Info-ZIP Macintosh (old)"},
+    {0x2605, "ZipIt Macintosh (first version)"},
+    {0x2705, "ZipIt Macintosh 1.3.5+ (w/o full filename)"},
+    {0x2805, "ZipIt Macintosh 1.3.5+"},
+    {0x334d, "Info-ZIP Macintosh (new)"},
+    {0x4154, "Tandem NSK"},
+    {0x4341, "Acorn/SparkFS"},
+    {0x4453, "Windows NT security descriptor"},
+    {0x4704, "VM/CMS"},
+    {0x470f, "MVS"},
+    {0x4854, "Theos, old unofficial port"},
+    {0x4b46, "FWKCS MD5"},
+    {0x4c41, "OS/2 access control list (text ACL)"},
+    {0x4d49, "Info-ZIP OpenVMS (obsolete)"},
+    {0x4d63, "Macintosh SmartZIP"},
+    {0x4f4c, "Xceed original location extra field"},
+    {0x5356, "AOS/VS (ACL)"},
+    {0x5455, "extended timestamp"},
+    {0x554e, "Xceed unicode extra field"},
+    {0x5855, "Info-ZIP UNIX (original)"},
+    {0x6375, "Info-ZIP UTF-8 comment field"},
+    {0x6542, "BeOS (BeBox, PowerMac, etc.)"},
+    {0x6854, "Theos"},
+    {0x7075, "Info-ZIP UTF-8 name field"},
+    {0x7441, "AtheOS (AtheOS/Syllable attributes)"},
+    {0x756e, "ASi UNIX"},
+    {0x7855, "Info-ZIP UNIX"},
+    {0x7875, "Info-ZIP UNIX 3rd generation"},
+    {0x9901, "WinZIP AES encryption"},
+    {0xa220, "Microsoft Open Packaging Growth Hint"},
+    {0xcafe, "executable Java JAR file"},
+    {0xfb4a, "SMS/QDOS"}, /* per InfoZIP extrafld.txt */
+    {0xfd4a, "SMS/QDOS"}, /* per appnote.txt */
+    {UINT32_MAX, NULL}};
 
 
 const char *progname;
 
 #define PROGRAM "zipcmp"
 
-#define USAGE "usage: %s [-hipqtVv] archive1 archive2\n"
+#define USAGE "usage: %s [-" OPTIONS "] archive1 archive2\n"
 
 char help_head[] = PROGRAM " (" PACKAGE ") by Dieter Baron and Thomas Klausner\n\n";
 
 char help[] = "\n\
-  -h       display this help message\n\
   -C       check archive consistencies\n\
+  -h       display this help message\n\
   -i       compare names ignoring case distinctions\n\
   -p       compare as many details as possible\n\
   -q       be quiet\n\
   -s       print a summary\n\
+  -T       compare time stamps\n\
   -t       test zip files (compare file contents to checksum)\n\
   -V       display version number\n\
   -v       be verbose (print differences, default)\n\
@@ -202,10 +175,10 @@ char help[] = "\n\
 Report bugs to <info@libzip.org>.\n";
 
 char version_string[] = PROGRAM " (" PACKAGE " " VERSION ")\n\
-Copyright (C) 2003-2022 Dieter Baron and Thomas Klausner\n\
+Copyright (C) 2003-2024 Dieter Baron and Thomas Klausner\n\
 " PACKAGE " comes with ABSOLUTELY NO WARRANTY, to the extent permitted by law.\n";
 
-#define OPTIONS "hVCipqstv"
+#define OPTIONS "ChipqsTtVv"
 
 
 #define BOTH_ARE_ZIPS(a) (a[0].za && a[1].za)
@@ -231,7 +204,7 @@ static int list_directory(const char *name, struct archive *a);
 static int list_zip(const char *name, struct archive *a);
 static int test_file(zip_t *za, zip_uint64_t idx, const char *zipname, const char *filename, zip_uint64_t size, zip_uint32_t crc);
 
-int ignore_case, test_files, paranoid, verbose, have_directory, check_consistency, summary;
+int ignore_case, test_files, paranoid, verbose, have_directory, check_consistency, compare_time_stamps, summary;
 int plus_count = 0, minus_count = 0;
 
 diff_output_t output;
@@ -246,6 +219,7 @@ main(int argc, char *const argv[]) {
     ignore_case = 0;
     test_files = 0;
     check_consistency = 0;
+    compare_time_stamps = 0;
     paranoid = 0;
     have_directory = 0;
     verbose = 1;
@@ -253,40 +227,42 @@ main(int argc, char *const argv[]) {
 
     while ((c = getopt(argc, argv, OPTIONS)) != -1) {
         switch (c) {
-            case 'C':
-                check_consistency = 1;
-                break;
-            case 'i':
-                ignore_case = 1;
-                break;
-            case 'p':
-                paranoid = 1;
-                break;
-            case 'q':
-                verbose = 0;
-                break;
-	    case 's':
-		summary = 1;
-		break;
-            case 't':
-                test_files = 1;
-                break;
-            case 'v':
-                verbose = 1;
-                break;
-                
-            case 'h':
-                fputs(help_head, stdout);
-                printf(USAGE, progname);
-                fputs(help, stdout);
-                exit(0);
-            case 'V':
-                fputs(version_string, stdout);
-                exit(0);
-                
-            default:
-                fprintf(stderr, USAGE, progname);
-                exit(2);
+        case 'C':
+            check_consistency = 1;
+            break;
+        case 'h':
+            fputs(help_head, stdout);
+            printf(USAGE, progname);
+            fputs(help, stdout);
+            exit(0);
+        case 'i':
+            ignore_case = 1;
+            break;
+        case 'p':
+            paranoid = 1;
+            break;
+        case 'q':
+            verbose = 0;
+            break;
+        case 's':
+            summary = 1;
+            break;
+        case 'T':
+            compare_time_stamps = 1;
+            break;
+        case 't':
+            test_files = 1;
+            break;
+        case 'V':
+            fputs(version_string, stdout);
+            exit(0);
+        case 'v':
+            verbose = 1;
+            break;
+
+        default:
+            fprintf(stderr, USAGE, progname);
+            exit(2);
         }
     }
 
@@ -346,11 +322,11 @@ compare_zip(char *const zn[]) {
         if (comment_compare(a[0].comment, a[0].comment_length, a[1].comment, a[1].comment_length) != 0) {
             if (a[0].comment_length > 0) {
                 diff_output_data(&output, '-', (const zip_uint8_t *)a[0].comment, a[0].comment_length, "archive comment");
-		minus_count++;
+                minus_count++;
             }
             if (a[1].comment_length > 0) {
                 diff_output_data(&output, '+', (const zip_uint8_t *)a[1].comment, a[1].comment_length, "archive comment");
-		plus_count++;
+                plus_count++;
             }
             res = 1;
         }
@@ -369,7 +345,7 @@ compare_zip(char *const zn[]) {
     }
 
     if (summary) {
-	printf("%d files removed, %d files added\n", minus_count, plus_count);
+        printf("%d files removed, %d files added\n", minus_count, plus_count);
     }
 
     switch (res) {
@@ -449,67 +425,69 @@ list_directory(const char *name, struct archive *a) {
         zip_int64_t crc;
 
         switch (ent->fts_info) {
-            case FTS_DOT:
-            case FTS_DP:
-            case FTS_DEFAULT:
-            case FTS_SL:
-            case FTS_NSOK:
-                break;
-
-            case FTS_DC:
-            case FTS_DNR:
-            case FTS_ERR:
-            case FTS_NS:
-            case FTS_SLNONE:
-                /* TODO: error */
-                fts_close(fts);
-                return -1;
-
-            case FTS_D:
-            case FTS_F:
-                if (a->nentry >= nalloc) {
-                    nalloc += 16;
-                    if (nalloc > SIZE_MAX / sizeof(a->entry[0])) {
-                        fprintf(stderr, "%s: malloc failure\n", progname);
-                        exit(1);
-                    }
-                    a->entry = realloc(a->entry, sizeof(a->entry[0]) * nalloc);
-                    if (a->entry == NULL) {
-                        fprintf(stderr, "%s: malloc failure\n", progname);
-                        exit(1);
-                    }
+        case FTS_DOT:
+        case FTS_DP:
+        case FTS_DEFAULT:
+        case FTS_SL:
+        case FTS_NSOK:
+            break;
+
+        case FTS_DC:
+        case FTS_DNR:
+        case FTS_ERR:
+        case FTS_NS:
+        case FTS_SLNONE:
+            /* TODO: error */
+            fts_close(fts);
+            return -1;
+
+        case FTS_D:
+        case FTS_F:
+            if (a->nentry >= nalloc) {
+                nalloc += 16;
+                if (nalloc > SIZE_MAX / sizeof(a->entry[0])) {
+                    fprintf(stderr, "%s: malloc failure\n", progname);
+                    exit(1);
+                }
+                a->entry = realloc(a->entry, sizeof(a->entry[0]) * nalloc);
+                if (a->entry == NULL) {
+                    fprintf(stderr, "%s: malloc failure\n", progname);
+                    exit(1);
                 }
-                
-                if (ent->fts_info == FTS_D) {
-                    char *dir_name;
-                    
-                    if (ent->fts_path[prefix_length - 1] == '\0') {
-                        break;
-                    }
-                    
-                    size_t dir_name_size = strlen(ent->fts_path + prefix_length) + 2;
-                    dir_name = malloc(dir_name_size);
-                    if (dir_name == NULL) {
-                        fprintf(stderr, "%s: malloc failure\n", progname);
-                        exit(1);
-                    }
-                    snprintf(dir_name, dir_name_size, "%s/", ent->fts_path + prefix_length);
-                    a->entry[a->nentry].name = dir_name;
-                    a->entry[a->nentry].size = 0;
-                    a->entry[a->nentry].crc = 0;
+            }
+
+            if (ent->fts_info == FTS_D) {
+                char *dir_name;
+
+                if (ent->fts_path[prefix_length - 1] == '\0') {
+                    break;
                 }
-                else {
-                    a->entry[a->nentry].name = strdup(ent->fts_path + prefix_length);
-                    a->entry[a->nentry].size = (zip_uint64_t)ent->fts_statp->st_size;
-                    if ((crc = compute_crc(ent->fts_accpath)) < 0) {
-                        fts_close(fts);
-                        return -1;
-                    }
-                
-                    a->entry[a->nentry].crc = (zip_uint32_t)crc;
+
+                size_t dir_name_size = strlen(ent->fts_path + prefix_length) + 2;
+                dir_name = malloc(dir_name_size);
+                if (dir_name == NULL) {
+                    fprintf(stderr, "%s: malloc failure\n", progname);
+                    exit(1);
                 }
-                a->nentry++;
-                break;
+                snprintf(dir_name, dir_name_size, "%s/", ent->fts_path + prefix_length);
+                a->entry[a->nentry].name = dir_name;
+                a->entry[a->nentry].size = 0;
+                a->entry[a->nentry].crc = 0;
+                a->entry[a->nentry].last_modification_time = 0;
+            }
+            else {
+                a->entry[a->nentry].name = strdup(ent->fts_path + prefix_length);
+                a->entry[a->nentry].size = (zip_uint64_t)ent->fts_statp->st_size;
+                if ((crc = compute_crc(ent->fts_accpath)) < 0) {
+                    fts_close(fts);
+                    return -1;
+                }
+
+                a->entry[a->nentry].crc = (zip_uint32_t)crc;
+                a->entry[a->nentry].last_modification_time = ent->fts_statp->st_mtime;
+            }
+            a->nentry++;
+            break;
         }
     }
 
@@ -565,6 +543,12 @@ list_zip(const char *name, struct archive *a) {
                 a->entry[i].comp_method = 0;
                 a->entry[i].n_extra_fields = 0;
             }
+            if (compare_time_stamps) {
+                a->entry[i].last_modification_time = st.mtime;
+            }
+            else {
+                a->entry[i].last_modification_time = 0;
+            }
         }
 
         if (paranoid) {
@@ -597,20 +581,21 @@ comment_compare(const char *c1, size_t l1, const char *c2, size_t l2) {
 }
 
 
-static int compare_list(char *const name[2], const void *list[2], const zip_uint64_t list_length[2], int element_size, int (*cmp)(const void *a, const void *b), int (*ignore)(const void *list, int last, const void *other), int (*check)(char *const name[2], const void *a, const void *b), void (*print)(char side, const void *element), void (*start_file)(const void *element)) {
+static int
+compare_list(char *const name[2], const void *list[2], const zip_uint64_t list_length[2], int element_size, int (*cmp)(const void *a, const void *b), int (*ignore)(const void *list, int last, const void *other), int (*check)(char *const name[2], const void *a, const void *b), void (*print)(char side, const void *element), void (*start_file)(const void *element)) {
     unsigned int i[2];
     int j;
     int diff;
 
 #define INC(k) (i[k]++, list[k] = ((const char *)list[k]) + element_size)
-#define PRINT(k)                                          \
-    do {                                                  \
-        if (ignore && ignore(list[k], i[k] >= list_length[k] - 1, i[1-k] < list_length[1-k] ? list[1-k] : NULL)) {   \
-            break;                                        \
-        }                                                 \
-        print((k) ? '+' : '-', list[k]);                  \
-        (k) ? plus_count++ : minus_count++;		  \
-        diff = 1;                                         \
+#define PRINT(k)                                                                                                         \
+    do {                                                                                                                 \
+        if (ignore && ignore(list[k], i[k] >= list_length[k] - 1, i[1 - k] < list_length[1 - k] ? list[1 - k] : NULL)) { \
+            break;                                                                                                       \
+        }                                                                                                                \
+        print((k) ? '+' : '-', list[k]);                                                                                 \
+        (k) ? plus_count++ : minus_count++;                                                                              \
+        diff = 1;                                                                                                        \
     } while (0)
 
     i[0] = i[1] = 0;
@@ -742,8 +727,12 @@ entry_cmp(const void *p1, const void *p2) {
         else
             return -1;
     }
-    if (e1->crc != e2->crc)
+    if (e1->crc != e2->crc) {
         return (int)e1->crc - (int)e2->crc;
+    }
+    if (e1->last_modification_time != e2->last_modification_time) {
+        return (int)(e1->last_modification_time - e2->last_modification_time);
+    }
 
     return 0;
 }
@@ -753,24 +742,24 @@ static int
 entry_ignore(const void *p, int last, const void *o) {
     const struct entry *e = (const struct entry *)p;
     const struct entry *other = (const struct entry *)o;
-    
+
     size_t length = strlen(e[0].name);
-    
+
     if (length == 0 || e[0].name[length - 1] != '/') {
         /* not a directory */
         return 0;
     }
-    
+
     if (other != NULL && strlen(other->name) > length && strncmp(other->name, e[0].name, length) == 0) {
         /* not empty in other archive */
         return 1;
     }
-    
+
     if (last || (strlen(e[1].name) < length || strncmp(e[0].name, e[1].name, length) != 0)) {
         /* empty in this archive */
         return 0;
     }
-    
+
     /* not empty in this archive */
     return 1;
 }
@@ -806,17 +795,19 @@ entry_paranoia_checks(char *const name[2], const void *p1, const void *p2) {
 }
 
 
-static void entry_print(char side, const void *p) {
+static void
+entry_print(char side, const void *p) {
     const struct entry *e = (struct entry *)p;
 
-    diff_output_file(&output, side, e->name, e->size, e->crc);
+    diff_output_file(&output, side, e->name, e->size, e->crc, e->last_modification_time);
 }
 
 
-static void entry_start_file(const void *p) {
+static void
+entry_start_file(const void *p) {
     const struct entry *e = (struct entry *)p;
-    
-    diff_output_start_file(&output, e->name, e->size, e->crc);
+
+    diff_output_start_file(&output, e->name, e->size, e->crc, e->last_modification_time);
 }
 
 
@@ -862,19 +853,20 @@ test_file(zip_t *za, zip_uint64_t idx, const char *zipname, const char *filename
 }
 
 
-static const char *map_enum(const enum_map_t *map, uint32_t value) {
+static const char *
+map_enum(const enum_map_t *map, uint32_t value) {
     static char unknown[16];
     size_t i = 0;
-    
+
     while (map[i].value < UINT32_MAX) {
         if (map[i].value == value) {
             return map[i].name;
         }
         i++;
     }
-    
+
     snprintf(unknown, sizeof(unknown), "unknown (%u)", value);
     unknown[sizeof(unknown) - 1] = '\0';
-    
+
     return unknown;
 }
