diff --git a/ChangeLog b/ChangeLog
index 8f1f11f9a..c166a7afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2007-07-19
+ChangeLog - 2007-08-01
 
 
 Version 0.2.6 (under dev!):
+   * fixed terminal encoding detection when NLS is disabled (bug #20646)
    * fixed crash when sending data to channel or pv on disconnected server
      (bug #20524)
    * improved command /server ant its output
diff --git a/src/common/weechat.c b/src/common/weechat.c
index a391ee29b..b654bb59a 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -817,8 +817,8 @@ weechat_sigsegv ()
 int
 main (int argc, char *argv[])
 {
-#ifdef ENABLE_NLS
     setlocale (LC_ALL, "");             /* initialize gettext               */
+#ifdef ENABLE_NLS
     bindtextdomain (PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (PACKAGE, "UTF-8");
     textdomain (PACKAGE);
diff --git a/src/common/weechat.h b/src/common/weechat.h
index 61470b00f..34e95a50e 100644
--- a/src/common/weechat.h
+++ b/src/common/weechat.h
@@ -31,8 +31,9 @@
 #include <gnutls/gnutls.h>
 #endif
 
+#include <locale.h>
+
 #if defined(ENABLE_NLS) && !defined(_)
-    #include <locale.h>
     #ifdef HAVE_LIBINTL_H
         #include <libintl.h>
     #else
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 8f1f11f9a..c166a7afa 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2007-07-19
+ChangeLog - 2007-08-01
 
 
 Version 0.2.6 (under dev!):
+   * fixed terminal encoding detection when NLS is disabled (bug #20646)
    * fixed crash when sending data to channel or pv on disconnected server
      (bug #20524)
    * improved command /server ant its output
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index a391ee29b..b654bb59a 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -817,8 +817,8 @@ weechat_sigsegv ()
 int
 main (int argc, char *argv[])
 {
-#ifdef ENABLE_NLS
     setlocale (LC_ALL, "");             /* initialize gettext               */
+#ifdef ENABLE_NLS
     bindtextdomain (PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (PACKAGE, "UTF-8");
     textdomain (PACKAGE);
diff --git a/weechat/src/common/weechat.h b/weechat/src/common/weechat.h
index 61470b00f..34e95a50e 100644
--- a/weechat/src/common/weechat.h
+++ b/weechat/src/common/weechat.h
@@ -31,8 +31,9 @@
 #include <gnutls/gnutls.h>
 #endif
 
+#include <locale.h>
+
 #if defined(ENABLE_NLS) && !defined(_)
-    #include <locale.h>
     #ifdef HAVE_LIBINTL_H
         #include <libintl.h>
     #else