diff --git a/ChangeLog b/ChangeLog
index e21316b710..38be985150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-01  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* plug-ins/common/gif-load.c (GetCode): Applied patch from Rik
+	Snel that fixes loading of .gif files that contains 1-byte data
+	blocks. (Bug #535888.)
+
 2008-05-31  Martin Nordholts  <martinn@svn.gnome.org>
 
 	Add keyboard shortcut support for reseting to default value of
diff --git a/plug-ins/common/gif-load.c b/plug-ins/common/gif-load.c
index 760fc5cecf..ebd355369e 100644
--- a/plug-ins/common/gif-load.c
+++ b/plug-ins/common/gif-load.c
@@ -624,7 +624,7 @@ GetCode (FILE *fd,
       return 0;
     }
 
-  if ((curbit + code_size) >= lastbit)
+  while ((curbit + code_size) >= lastbit)
     {
       if (done)
         {