diff --git a/ChangeLog b/ChangeLog
index 91cf0172..10d8e32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-11 Fabian Groffen <grobian@gentoo.org>
+	* nano.c: Don't include langinfo.h if not using ENABLE_UTF8
+	  (Savannah patch 6565)
+
 2008-07-11 Mitsuya Shibata <mty.shibata@gmail.com>
 	* text.c: Fix crashing in help menu when using certain locales
 	  (Savannah bug 23751)
diff --git a/src/nano.c b/src/nano.c
index bb19f116..46b63112 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -32,7 +32,9 @@
 #include <errno.h>
 #include <ctype.h>
 #include <locale.h>
+#ifdef ENABLE_UTF8
 #include <langinfo.h>
+#endif
 #include <termios.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>