diff --git a/ChangeLog b/ChangeLog
index 69e4d9ba1674ca4c81635b966fb78d072d8ac571..8307b7950d87f6bec0333892df7307bd6deecc64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,9 @@ CVS code -
 	- Move the reset_cursor() call to the beginning of the main
 	  input loop, and remove the apparently unnecessary wrefresh()
 	  call. (David Benbennick)
+	- Call setlocale() outside the ENABLE_NLS #ifdef, since UTF-8
+	  support won't work properly if the locale isn't set, whether
+	  NLS is enabled or not. (Junichi Uekawa)
 - nano.h:
 	- Reassign the key for full justification to Ctrl-U, for
 	  compatibility with the current version of Pico. (DLR)
diff --git a/src/nano.c b/src/nano.c
index f521ee27a8d9436e03fbb60128ae32b30d74ae57..66fa16b6fafb0ad6223103ac811c56eb72e62c0a 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3094,8 +3094,8 @@ int main(int argc, char *argv[])
     };
 #endif
 
-#ifdef ENABLE_NLS
     setlocale(LC_ALL, "");
+#ifdef ENABLE_NLS
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
 #endif