diff --git a/ChangeLog b/ChangeLog
index 22a412e7b..782538a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 559110 – Do not include libintl.h after glibintl.h
+
+	* glib/glibintl.h: Define bind_textdomain_codeset in the DISABLE_NLS
+	branch. Patch by Peter Kjellerstedt.
+
+	* glib/gutil.c: Don't include libintl.h directly.
+
 2008-11-28  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 562378 – callback return value not respected for callback option
diff --git a/glib/glibintl.h b/glib/glibintl.h
index 4bed7c144..0186723d9 100644
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -29,6 +29,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
 #define dcgettext(Domain,String,Type) (String)
 #define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
 #define bindtextdomain(Domain,Directory) (Domain) 
+#define bind_textdomain_codeset(Domain,Codeset)
 #endif
 
 /* not really I18N-related, but also a string marker macro */
diff --git a/glib/gutils.c b/glib/gutils.c
index 9cc7cbe84..d5407cae4 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -120,10 +120,6 @@
 #include <langinfo.h>
 #endif
 
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-#include <libintl.h>
-#endif
-
 const guint glib_major_version = GLIB_MAJOR_VERSION;
 const guint glib_minor_version = GLIB_MINOR_VERSION;
 const guint glib_micro_version = GLIB_MICRO_VERSION;