diff --git a/ChangeLog b/ChangeLog
index 8b3bc1af2..13abf5eaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 548321 – <string.h> is not included in gi18n-lib.h
+
+	* glib/gi18n.h:
+	* glib/gi18n-lib.h: Include string.h, since strlen is used in
+	the macros. Pointed out by Ignacio Casal Quinteiro
+
 2008-09-11  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk
diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index 9ba1f5165..674466e47 100644
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -22,6 +22,7 @@
 #include <glib/gstrfuncs.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #ifndef GETTEXT_PACKAGE
 #error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
diff --git a/glib/gi18n.h b/glib/gi18n.h
index a5c829b57..c94e8c13d 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -21,6 +21,7 @@
 
 #include <glib/gstrfuncs.h>
 #include <libintl.h>
+#include <string.h>
 
 #define  _(String) gettext (String)
 #define Q_(String) g_dpgettext (NULL, String, 0)