diff --git a/tuxpuck/png.c b/tuxpuck/png.c

index c0c26bc..10edd77 100644

--- a/tuxpuck/png.c

+++ b/tuxpuck/png.c

@@ -74,7 +74,7 @@ SDL_Surface *loadPNG(Uint8 * data, Uint32 * memcounter)

    * the normal method of doing things with libpng).  REQUIRED unless you

    * set up your own error handlers in png_create_read_struct() earlier.

    */

-  if (setjmp(png_ptr->jmpbuf)) {

+  if (setjmp(png_jmpbuf(png_ptr))) {

     SDL_SetError("Error reading the PNG file.");

     goto done;

   }

@@ -142,9 +142,9 @@ SDL_Surface *loadPNG(Uint8 * data, Uint32 * memcounter)

       Rmask = 0x000000FF;

       Gmask = 0x0000FF00;

       Bmask = 0x00FF0000;

-      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;

+      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;

     } else {

-      int s = (info_ptr->channels == 4) ? 0 : 8;

+      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;

       Rmask = 0xFF000000 >> s;

       Gmask = 0x00FF0000 >> s;

       Bmask = 0x0000FF00 >> s;

@@ -152,7 +152,7 @@ SDL_Surface *loadPNG(Uint8 * data, Uint32 * memcounter)

     }

   }

   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,

-			     bit_depth * info_ptr->channels, Rmask, Gmask,

+			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,

 			     Bmask, Amask);

   if (surface == NULL) {

     SDL_SetError("Out of memory");

@@ -190,6 +190,9 @@ SDL_Surface *loadPNG(Uint8 * data, Uint32 * memcounter)

   /* Load the palette, if any */

   palette = surface->format->palette;

   if (palette) {

+		png_colorp png_palette;

+		int num_palette;

+		png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);

     if (color_type == PNG_COLOR_TYPE_GRAY) {

       palette->ncolors = 256;

       for (i = 0; i < 256; i++) {

@@ -197,12 +200,12 @@ SDL_Surface *loadPNG(Uint8 * data, Uint32 * memcounter)

 	palette->colors[i].g = i;

 	palette->colors[i].b = i;

       }

-    } else if (info_ptr->num_palette > 0) {

-      palette->ncolors = info_ptr->num_palette;

-      for (i = 0; i < info_ptr->num_palette; ++i) {

-	palette->colors[i].b = info_ptr->palette[i].blue;

-	palette->colors[i].g = info_ptr->palette[i].green;

-	palette->colors[i].r = info_ptr->palette[i].red;

+    } else if (num_palette > 0) {

+      palette->ncolors = num_palette;

+      for (i = 0; i < num_palette; ++i) {

+	palette->colors[i].b = png_palette[i].blue;

+	palette->colors[i].g = png_palette[i].green;

+	palette->colors[i].r = png_palette[i].red;

       }

     }

   }