diff --git a/ChangeLog b/ChangeLog
index 81696539f..d83e3ab87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-14  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 557210 – g_compute_checksum_for_* asserts with less than 2
+	bytes
+
+	* glib/gchecksum.c (g_compute_checksum_for_data): Accept
+	lengths < 2. Patch by Tommi Komulainen
+
 2008-10-31  Grahame Bowland  <grahame@angrygoats.net>
 
 	Bug 558185 – 'parent' variable in g_local_file_get_child_for_display_name() 
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 41cc1f845..529f79bc4 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -1389,7 +1389,6 @@ g_compute_checksum_for_data (GChecksumType  checksum_type,
 
   g_return_val_if_fail (IS_VALID_TYPE (checksum_type), NULL);
   g_return_val_if_fail (data != NULL, NULL);
-  g_return_val_if_fail (length > 1, NULL);
 
   checksum = g_checksum_new (checksum_type);
   if (!checksum)