diff --git a/.gitignore b/.gitignore
index 57b47ff..c4f5673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-optipng-0.6.4.tar.gz
+/optipng-0.6.5.tar.gz
diff --git a/optipng-0.6.5-setjmp-include.patch b/optipng-0.6.5-setjmp-include.patch
new file mode 100644
index 0000000..6b342bf
--- /dev/null
+++ b/optipng-0.6.5-setjmp-include.patch
@@ -0,0 +1,17 @@
+diff -up optipng-0.6.5/src/opngoptim.c~ optipng-0.6.5/src/opngoptim.c
+--- optipng-0.6.5/src/opngoptim.c~	2010-12-22 19:08:00.000000000 +0200
++++ optipng-0.6.5/src/opngoptim.c	2011-04-28 13:16:11.846000052 +0300
+@@ -19,12 +19,12 @@
+ #include "proginfo.h"
+ 
+ #include "cbitset.h"
+-#include "cexcept.h"
+ #include "opngreduc.h"
+ #include "osys.h"
+ #include "png.h"
+ #include "pngx.h"
+ #include "pngxtern.h"
++#include "cexcept.h"
+ #include "zlib.h"
+ 
+ 
diff --git a/optipng.spec b/optipng.spec
index 4b9c234..b486a59 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,14 +1,16 @@
 %global makefile gcc.mak
 
 Name:           optipng
-Version:        0.6.4
-Release:        2%{?dist}
+Version:        0.6.5
+Release:        1%{?dist}
 Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
+# http://sf.net/tracker/?func=detail&aid=3294326&group_id=151404&atid=780915
+Patch0:         %{name}-0.6.5-setjmp-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -22,6 +24,7 @@ and corrections.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Ensure system libs and headers are used; as of 0.6.3 pngxtern will use
 # the bundled headers if present even with -with-system-*, causing failures.
@@ -55,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.6.5-1
+- Update to 0.6.5.
+- Patch to fix setjmp.h duplicate inclusion with system libpng.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -64,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Jul 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.6.3-1
+* Sun Jul 19 2009 Ville Skyttä <ville.skytta@iki.fi> - 0.6.3-1
 - Update to 0.6.3.
 - Use %%global instead of %%define.
 
@@ -76,10 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 - Update to new release to fix buffer overflow
 - Red Hat Bugzilla #471206
 
-* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.1-1
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta@iki.fi> - 0.6.1-1
 - 0.6.1.
 
-* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.5-4
+* Thu Feb 14 2008 Ville Skyttä <ville.skytta@iki.fi> - 0.5.5-4
 - Apply sf.net patch #1790969 to fix crash with -log.
 - Cosmetic specfile changes.
 
diff --git a/sources b/sources
index ee449e8..7a8549a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6c10dd8d8f1d5b579221bc9cfbfbcb6  optipng-0.6.4.tar.gz
+9df5fa7bb45ae096ed6c6e0d8dc43dc7  optipng-0.6.5.tar.gz