diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index db0147d6bc..e3ef168ba3 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -380,12 +380,7 @@ private:
 
 bool wxConvBrokenFileNames::UseUTF8() const
 {
-#if defined HAVE_LANGINFO_H && defined CODESET
-    char *codeset = nl_langinfo(CODESET);
-    return strcmp(codeset, "UTF-8") == 0;
-#else
-    return false;
-#endif
+    return wxLocale::GetSystemEncoding() == wxFONTENCODING_UTF8;
 }
 
 size_t wxConvBrokenFileNames::MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const