diff --git a/grace/src/rstdrv.c b/grace/src/rstdrv.c
index 7a92692..cc00fe0 100644
--- a/grace/src/rstdrv.c
+++ b/grace/src/rstdrv.c
@@ -35,6 +35,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <zlib.h>
 
 #include "defines.h"
 #include "utils.h"
@@ -885,7 +886,7 @@ static void rstImagePng(gdImagePtr ihandle, FILE *prstream)
         return;
     }
 
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
         png_destroy_write_struct(&png_ptr, &info_ptr);
         return;
     }