diff --git a/ChangeLog b/ChangeLog
index 236e892942..d095193f80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar  8 12:40:53 GMT 2000  Adam D. Moss <adam@gimp.org>
+
+	* plug-ins/common/xbm.c: Type of written array should
+	be unsigned, as that's the type of data we're initializing
+	it with.  Cast back to signed for passing to XCreateBitmapFromData()
+	etc.
+
 2000-03-07  Michael Natterer  <mitch@gimp.org>
 
 	* app/disp_callbacks.c: show GIMP_BAD_CURSOR if we have no layers.
diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c
index 5ed35accab..d8e424aff8 100644
--- a/plug-ins/common/xbm.c
+++ b/plug-ins/common/xbm.c
@@ -1024,7 +1024,7 @@ save_image (gchar  *filename,
     }
 
   fprintf (fp, "static %s %s_bits[] = {\n  ",
-	   xsvals.x10_format ? "short" : "char", prefix);
+	   xsvals.x10_format ? "unsigned short" : "unsigned char", prefix);
 
   /* Allocate a new set of pixels. */
   tileheight = gimp_tile_height ();