diff -ur open-vm-tools-2010.01.19-226760/lib/image/imageUtilPng.c open-vm-tools-2010.01.19-226760.new/lib/image/imageUtilPng.c
--- open-vm-tools-2010.01.19-226760/lib/image/imageUtilPng.c	2010-01-20 22:52:06.000000000 +0100
+++ open-vm-tools-2010.01.19-226760.new/lib/image/imageUtilPng.c	2010-02-15 11:28:48.819746664 +0100
@@ -136,7 +136,7 @@
       goto exit;
    }
 
-   if (setjmp(png_ptr->jmpbuf)) {
+   if (setjmp(png_jmpbuf(png_ptr))) {
       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
       goto exit;
    }
@@ -350,7 +350,7 @@
       goto error;
    }
 
-   if (setjmp(png_ptr->jmpbuf)) {
+   if (setjmp(png_jmpbuf(png_ptr))) {
       png_destroy_write_struct(&png_ptr, &info_ptr);
       goto error;
    }
--- open-vm-tools-2009.12.16-217847/configure.ac.old	2010-02-15 13:13:41.027109223 +0100
+++ open-vm-tools-2009.12.16-217847/configure.ac	2010-02-15 13:13:51.165024639 +0100
@@ -498,9 +498,9 @@
                             [AC_MSG_ERROR([uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package.])])
 
            # Check for libpng.
-           AC_VMW_CHECK_LIB([png12],
+           AC_VMW_CHECK_LIB([png],
                             [LIBPNG],
-                            [libpng12],
+                            [libpng],
                             [libpng-config],
                             [],
                             [png.h],