diff --git a/ChangeLog b/ChangeLog
index a8821def70..408cda8507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-30  Mukund Sivaraman  <muks@mukund.org>
+
+	* plug-ins/common/compose.c: Specify maximum field width in
+	sscanf() to avoid buffer overflows.
+
 2007-05-30  Mukund Sivaraman  <muks@mukund.org>
 
 	* plug-ins/common/channel_mixer.c: Specify maximum field width in
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index c4d6e4da9e..47ceca0c2a 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -481,7 +481,7 @@ run (const gchar      *name,
           gint nret;
 
           nret = sscanf (gimp_parasite_data (parasite),
-                         "source=%d type=%s %d %d %d %d",
+                         "source=%d type=%31s %d %d %d %d",
                          &composevals.source_layer_ID,
                          composevals.compose_type,
                          &composevals.inputs[0].comp.ID,