diff --git a/open-vm-tools-libpng14.patch b/open-vm-tools-libpng14.patch
new file mode 100644
index 0000000..e547e9d
--- /dev/null
+++ b/open-vm-tools-libpng14.patch
@@ -0,0 +1,22 @@
+Index: open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c
+===================================================================
+--- open-vm-tools-2010.03.20-243334.orig/lib/image/imageUtilPng.c
++++ open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c
+@@ -136,7 +136,7 @@ ImageUtil_ReadPNGBuffer(ImageInfo *image
+       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 @@ ImageUtil_ConstructPNGBuffer(const Image
+       goto error;
+    }
+ 
+-   if (setjmp(png_ptr->jmpbuf)) {
++   if (setjmp(png_jmpbuf(png_ptr))) {
+       png_destroy_write_struct(&png_ptr, &info_ptr);
+       goto error;
+    }
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 2db92f1..4a0705b 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  7 10:44:31 UTC 2010 - dimstar@opensuse.org
+
+- Add open-vm-tools-libpng14.patch to fix build with libpng 1.4.
+
 -------------------------------------------------------------------
 Wed Mar 24 09:43:33 UTC 2010 - dimstar@opensuse.org
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 69d78dc..3aff8b6 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -24,7 +24,7 @@ Name:           open-vm-tools
 Group:          System/Emulators/PC
 Summary:        Open Virtual Machine Tools
 Version:        2010.03.20
-Release:        1
+Release:        2
 %define         svn_rev 243334
 Url:            http://open-vm-tools.sourceforge.net/
 License:        BSD3c ; GPLv2 ; LGPLv2.1
@@ -36,6 +36,8 @@ Source4:        open-vm-tools.permissions
 Source5:        vmware-user-autostart-wrapper
 Source6:        open-vm-tools-modprobe.conf
 Source98:       preamble
+# PATCH-FIX-UPSTREAM open-vm-tools-libpng14.patch sf#2983141 dimstar@opensuse.org -- Fix build with libpng 1.4
+Patch0:         open-vm-tools-libpng14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  kernel-source
@@ -147,6 +149,7 @@ if you intend to create own plugins for vmtoolsd.
 
 %prep
 %setup -q -n %{name}-%{version}-%{svn_rev}
+%patch0 -p1
 chmod -x AUTHORS COPYING ChangeLog NEWS README
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README