diff --git a/ChangeLog b/ChangeLog
index e24fe626..4a2ffcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-27  Even Rouault  <even.rouault@spatialys.com>
+
+	* libtiff/tif_config.vc.h: no longer use "#define snprintf _snprintf" with
+	Visual Studio 2015 aka VC 14 aka MSVC 1900
+
 2014-11-20  Even Rouault  <even.rouault@spatialys.com>
 
 	* libtiff/tif_lzw.c: prevent potential null dereference of
diff --git a/libtiff/tif_config.vc.h b/libtiff/tif_config.vc.h
index c297cf3c..ef7588c0 100644
--- a/libtiff/tif_config.vc.h
+++ b/libtiff/tif_config.vc.h
@@ -47,7 +47,10 @@
 /* Set the native cpu bit order */
 #define HOST_FILLORDER FILLORDER_LSB2MSB
 
+/* Visual Studio 2015 / VC 14 / MSVC 19.00 finally has snprintf() */
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */