diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 50ae26f81..c6d623534 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-19  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* mingwex/mb_wc_common.h (get_codepage): Get it
+	from __lc_codepage.
+
 2006-09-18  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* mingwex/gdtoa/g_xfmt.c (g_xfmt): Fix representation of infinity.
diff --git a/winsup/mingw/mingwex/mb_wc_common.h b/winsup/mingw/mingwex/mb_wc_common.h
index 8006d4bba..40028d682 100755
--- a/winsup/mingw/mingwex/mb_wc_common.h
+++ b/winsup/mingw/mingwex/mb_wc_common.h
@@ -1,18 +1,7 @@
-#include <locale.h>
-#include <string.h>
-#include <stdlib.h>
+__declspec(dllimport) unsigned int __lc_codepage;
 
 static inline
 unsigned int get_codepage (void)
 {
-  char* cp_string;
-  /*
-    locale :: "lang[_country[.code_page]]" 
-               | ".code_page"
-
-  */
-
-  if ((cp_string = strchr(setlocale(LC_CTYPE, NULL), '.')))
-    return  ((unsigned) atoi (cp_string + 1));
-  return 0;
+  return __lc_codepage;
 }