diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d938fb248..78d1a3a99 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/locale/locale.c (loadlocale): Fix dangling
+	switch statement caused by __HAVE_LOCALE_INFO__ not being
+	defined.
+
 2010-05-11  Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libc/string/strsignal.c: New file.
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index a204d3412..953da1376 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -882,9 +882,11 @@ restart:
     case LC_TIME:
       ret = __time_load_locale (locale, (void *) l_wctomb, charset);
       break;
+#endif /* __HAVE_LOCALE_INFO__ */
     default:
       break;
     }
+#ifdef __HAVE_LOCALE_INFO__
   if (ret)
     FAIL;
 #endif /* __HAVE_LOCALE_INFO__ */