diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c05188ba810..70169b06991 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-20  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/awt/image/PixelGrabber.java (setPixels(int,int,int,int,
+	ColorModel,byte[],int,int): Fixed byte to int conversion.
+
 2005-04-20  Michael Koch  <konqueror@gmx.de>
 
 	* java/io/FilePermission.java
diff --git a/libjava/java/awt/image/PixelGrabber.java b/libjava/java/awt/image/PixelGrabber.java
index bcfa050f3df..0287fb3d22b 100644
--- a/libjava/java/awt/image/PixelGrabber.java
+++ b/libjava/java/awt/image/PixelGrabber.java
@@ -522,7 +522,7 @@ public class PixelGrabber implements ImageConsumer
 
 		    assert (i >= 0 && i < int_pixel_buffer.length);
 		    assert (p >= 0 && p < pixels.length);
-		    int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
+		    int_pixel_buffer[i] = currentModel.getRGB (pixels[p] & 0xFF);
 		  }
 		else
 		  {