diff --git a/ChangeLog b/ChangeLog
index b69cce4003..88b63eb7cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-19  Manish Singh  <yosh@gimp.org>
+
+	* plug-ins/jpeg/jpeg-save.c (save_image): don't do pointer arithmetic
+	with void *. Fixes bug #304701.
+
 2005-05-19  Manish Singh  <yosh@gimp.org>
 
 	* app/config/test-config.c: Add casts to G_OBJECT() for
diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c
index f1af9956cc..08a14f0bf2 100644
--- a/plug-ins/jpeg/jpeg-save.c
+++ b/plug-ins/jpeg/jpeg-save.c
@@ -495,7 +495,7 @@ save_image (const gchar *filename,
           glong        xmp_data_size;
           gchar       *app_block;
 
-          xmp_data = gimp_parasite_data (parasite) + 10;
+          xmp_data = ((const gchar *)gimp_parasite_data (parasite)) + 10;
           xmp_data_size = gimp_parasite_data_size (parasite) - 10;
           g_print ("jpeg-save: saving XMP packet (%d bytes)\n",
                    (int) xmp_data_size);