diff --git a/podofo-0.9.5_stdc++98.patch b/podofo-0.9.5_stdc++98.patch
new file mode 100644
index 0000000..09976af
--- /dev/null
+++ b/podofo-0.9.5_stdc++98.patch
@@ -0,0 +1,12 @@
+diff -rupN podofo-0.9.5/CMakeLists.txt podofo-0.9.5-new/CMakeLists.txt
+--- podofo-0.9.5/CMakeLists.txt	2017-02-01 22:23:03.000000000 +0100
++++ podofo-0.9.5-new/CMakeLists.txt	2017-02-10 14:40:25.472066545 +0100
+@@ -296,8 +296,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         SET(PODOFO_USE_VISIBILITY ${PODOFO_HAVE_GCC4})
+     ENDIF(NOT DEFINED PODOFO_USE_VISIBILITY)
+ 
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+-
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
+ 
+     #
diff --git a/podofo.spec b/podofo.spec
index 29d4cc9..5e8b269 100644
--- a/podofo.spec
+++ b/podofo.spec
@@ -1,6 +1,6 @@
 Name:           podofo
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools and libraries to work with the PDF file format
 
 # The library is licensed under the LGPL.
@@ -13,6 +13,9 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:         podofo-0.9.4-freetype.patch
 # Fix build failure
 Patch1:         podofo-0.9.4_build.patch
+# Drop -std=c++98 from CXXFLAGS gcc appears to miscompile with it. See
+# https://sourceforge.net/p/podofo/mailman/message/35649256/
+Patch2:         podofo-0.9.5_stdc++98.patch
 
 BuildRequires:  gcc-c++
 %if %{?el7:1}%{!?el7:0}
@@ -124,6 +127,9 @@ find doc/html -exec touch -r %{SOURCE0} {} \;
 
 
 %changelog
+* Fri Feb 10 2017 Sandro Mani <manisandro@gmail.com> - 0.9.5-3
+- Drop -std=c++98 from CXXFLAGS
+
 * Fri Feb 03 2017 Sandro Mani <manisandro@gmail.com> - 0.9.5-2
 - Add Requires: openssl-devel to -devel