diff --git a/ChangeLog b/ChangeLog
index 45cd1963f7..ebc5b4ba40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-18  Tor Lillqvist  <tml@iki.fi>
+
+	* plug-ins/common/psp.c (read_block_header): Byteswap return
+	value. Thanks to Raphael Quinet for finding this.
+
 2000-05-17  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/scripts/camo.scm: no need to mention the
diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c
index 0dcaafc922..fd12b9cbdc 100644
--- a/plug-ins/common/psp.c
+++ b/plug-ins/common/psp.c
@@ -536,7 +536,7 @@ read_block_header (FILE    *f,
       *total_len = GUINT32_FROM_LE (len);
     }
 
-  return id;
+  return GUINT16_FROM_LE (id);
 }
 
 static gint