diff --git a/ChangeLog b/ChangeLog
index 5ac684eaae..6d1826d848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Tor Lillqvist  <tml@novell.com>
+
+	* modules/input/imime.c: Include <config.h>. (#317444, Kazuki
+	Iwamoto)
+
 2005-09-27  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5ac684eaae..6d1826d848 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-28  Tor Lillqvist  <tml@novell.com>
+
+	* modules/input/imime.c: Include <config.h>. (#317444, Kazuki
+	Iwamoto)
+
 2005-09-27  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/modules/input/imime.c b/modules/input/imime.c
index da5dc5bd36..72bc6afef7 100644
--- a/modules/input/imime.c
+++ b/modules/input/imime.c
@@ -20,6 +20,7 @@
  * $Id$
  */
 
+#include <config.h>
 #include <string.h>
 
 #include "gtk/gtkintl.h"