diff --git a/ChangeLog b/ChangeLog
index 69c690f..b908a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5313,3 +5313,7 @@ Fixed error in saving of cut_chars attribute.
 
 Fixed saving/handling of beep_command attribute.
 ----------------------------------------------------------------------
+Mon Apr 18 16:00:22 2005                        Michael Jennings (mej)
+
+Remove unused NO_XLOCALE crap and do it right.
+----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index 0e45ded..a69ed40 100644
--- a/configure.in
+++ b/configure.in
@@ -205,7 +205,7 @@ sys/ioctl.h sys/select.h sys/time.h \
 sys/sockio.h sys/byteorder.h malloc.h \
 utmpx.h unistd.h bsd/signal.h regex.h \
 regexp.h stdarg.h X11/Xmu/Atoms.h \
-X11/Sunkeysym.h)
+X11/Sunkeysym.h X11/Xlocale.h)
 AC_HEADER_TIME
 
 dnl# Missing typedefs and replacements
@@ -817,9 +817,6 @@ AC_ARG_ENABLE(xim,
 	        XIM="TRUE"
 ])
 
-# check if we need X_LOCALE definition
-AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, , [X locale.]), AC_DEFINE(NO_XLOCALE, , [No X locale.]))
-
 # For multibyte selection handling
 #if test "$MULTICHAR_ENCODING" != "none"; then
   AC_CHECK_LIB(Xmu, XmuInternAtom)
diff --git a/src/command.h b/src/command.h
index bd4ee03..5ba9a01 100644
--- a/src/command.h
+++ b/src/command.h
@@ -26,11 +26,10 @@
 # include <X11/Xproto.h>
 # include <X11/keysym.h>
 
-# if defined(NO_XLOCALE) || !defined(HAVE_X11_LOCALE_H)
-#  include <locale.h>
-# else
+# ifdef HAVE_X11_LOCALE_H
 #  include <X11/Xlocale.h>
 # endif
+# include <locale.h>
 
 # include "options.h"
 # include "system.h"  /* For RETSIGTYPE */
diff --git a/src/defaultfont.h b/src/defaultfont.h
index db58b2e..d1e3611 100644
--- a/src/defaultfont.h
+++ b/src/defaultfont.h
@@ -1,11 +1,11 @@
 #ifndef _DEFAULTFONT_H_
 #define _DEFAULTFONT_H_
 
-#if defined (NO_XLOCALE) || !defined(HAVE_X11_LOCALE_H)
-# include <locale.h>
-#else
-# include <X11/Xlocale.h>
-#endif
+# ifdef HAVE_X11_LOCALE_H
+#  include <X11/Xlocale.h>
+# else
+#  include <locale.h>
+# endif
 
 #ifdef HAVE_NL_LANGINFO
 # include <langinfo.h>