diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp
index 9e3fa18c..90c45c6c 100644
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -169,6 +169,13 @@
 #  define BOOST_NO_CXX11_ADDRESSOF
 #endif
 
+// Bug specific to VC14, 
+// See https://connect.microsoft.com/VisualStudio/feedback/details/1348277/link-error-when-using-std-codecvt-utf8-utf16-char16-t
+// and discussion here: http://blogs.msdn.com/b/vcblog/archive/2014/11/12/visual-studio-2015-preview-now-available.aspx?PageIndex=2
+#if  _CPPLIB_VER == 650
+#  define BOOST_NO_CXX11_HDR_CODECVT
+#endif
+
 #ifdef _CPPLIB_VER
 #  define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER
 #else
diff --git a/test/boost_no_cxx11_hdr_codecvt.ipp b/test/boost_no_cxx11_hdr_codecvt.ipp
index 37f91e5e..8adf4d7b 100644
--- a/test/boost_no_cxx11_hdr_codecvt.ipp
+++ b/test/boost_no_cxx11_hdr_codecvt.ipp
@@ -19,6 +19,9 @@ int test()
   using std::codecvt_utf8;
   using std::codecvt_utf16;
   using std::codecvt_utf8_utf16;
+#ifndef BOOST_NO_CXX11_CHAR16_T
+  std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> test;
+#endif
   return 0;
 }