diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h
index 7ee7ca9fc..bb0108616 100644
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -21,6 +21,8 @@
 
 
 // Define to enable Windows Unicode (UTF-8) support
+// NOTE: As of POCO C++ Libraries release 1.6.0, compiling POCO
+// without POCO_WIN32_UTF8 defined on Windows is deprecated.
 #define POCO_WIN32_UTF8
 
 
diff --git a/Foundation/include/Poco/Platform_WIN32.h b/Foundation/include/Poco/Platform_WIN32.h
index 03b87107a..67011c0de 100644
--- a/Foundation/include/Poco/Platform_WIN32.h
+++ b/Foundation/include/Poco/Platform_WIN32.h
@@ -148,7 +148,7 @@
 #endif
 
 
-#if (_MSC_VER >= 1300) && (_MSC_VER < 1400) // Visual Studio 2003, MSVC++ 7.1
+#if (_MSC_VER >= 1300) && (_MSC_VER < 1400)   // Visual Studio 2003, MSVC++ 7.1
 	#define POCO_MSVS_VERSION 2003
 	#define POCO_MSVC_VERSION 71
 #elif (_MSC_VER >= 1400) && (_MSC_VER < 1500) // Visual Studio 2005, MSVC++ 8.0
@@ -163,6 +163,9 @@
 #elif (_MSC_VER >= 1700) && (_MSC_VER < 1800) // Visual Studio 2012, MSVC++ 11.0
 	#define POCO_MSVS_VERSION 2012
 	#define POCO_MSVC_VERSION 110
+#elif (_MSC_VER >= 1800) && (_MSC_VER < 1900) // Visual Studio 2013, MSVC++ 12.0
+	#define POCO_MSVS_VERSION 2013
+	#define POCO_MSVC_VERSION 120
 #endif
 
 
@@ -173,7 +176,7 @@
 
 
 #if !defined(POCO_WIN32_UTF8)
-	#warning Compiling POCO on Windows without #define POCO_WIN32_UTF8 is deprecated.
+	#pragma message("Compiling POCO on Windows without #define POCO_WIN32_UTF8 is deprecated.")
 #endif