diff --git a/ChangeLog.txt b/ChangeLog.txt
index fdb1758..7593239 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -25,6 +25,12 @@
 [4] Fixed an issue whereby a malformed motion-JPEG frame could cause the "fast
 path" of libjpeg-turbo's Huffman decoder to read from uninitialized memory.
 
+[5] Added libjpeg-turbo version and build information to the global string
+table of the libjpeg and TurboJPEG API libraries.  This is a common practice in
+other infrastructure libraries, such as OpenSSL and libpng, because it makes it
+easy to examine an application binary and determine which version of the
+library the application was linked against.
+
 
 1.4.2
 =====
diff --git a/jcmaster.c b/jcmaster.c
index ea13d0d..dca02d2 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1997, Thomas G. Lane.
  * Modified 2003-2010 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains master control logic for the JPEG compressor.
@@ -18,6 +18,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jpegcomp.h"
+#include "jconfigint.h"
 
 
 /* Private state */
@@ -37,6 +38,16 @@
   int total_passes;             /* total # of passes needed */
 
   int scan_number;              /* current index in scan_info[] */
+
+  /*
+   * This is here so we can add libjpeg-turbo version/build information to the
+   * global string table without introducing a new global symbol.  Adding this
+   * information to the global string table allows one to examine a binary
+   * object and determine which version of libjpeg-turbo it was built from or
+   * linked against.
+   */
+  const char *jpeg_version;
+
 } my_comp_master;
 
 typedef my_comp_master * my_master_ptr;
@@ -622,4 +633,6 @@
     master->total_passes = cinfo->num_scans * 2;
   else
     master->total_passes = cinfo->num_scans;
+
+  master->jpeg_version = PACKAGE_NAME " version " VERSION " (build " BUILD ")";
 }