diff --git a/cairo-disable-lto.patch b/cairo-disable-lto.patch
new file mode 100644
index 0000000..29c1baf
--- /dev/null
+++ b/cairo-disable-lto.patch
@@ -0,0 +1,21 @@
+Index: cairo-1.12.16/build/configure.ac.warnings
+===================================================================
+--- cairo-1.12.16.orig/build/configure.ac.warnings
++++ cairo-1.12.16/build/configure.ac.warnings
+@@ -36,16 +36,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_T
+ dnl We also abuse the warning-flag facility to enable other compiler
+ dnl options.  Namely, the following:
+ 
+-dnl -flto working really needs a test link, not just a compile
+-
+-safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
+-AC_TRY_LINK([],[
+-	int main(int argc, char **argv) { return 0; }
+-],[],[
+-	MAYBE_WARN="$safe_MAYBE_WARN"
+-])
+-
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ dnl Also to turn various gcc/glibc-specific preprocessor checks
diff --git a/cairo.changes b/cairo.changes
index 1fa0919..7a7e3de 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 28 20:42:58 UTC 2013 - idonmez@suse.com
+
+- Add cairo-disable-lto.patch to disable LTO on s390{x} to fix the
+  build.
+
 -------------------------------------------------------------------
 Tue Aug 27 06:41:01 UTC 2013 - dimstar@opensuse.org
 
diff --git a/cairo.spec b/cairo.spec
index a06db6c..99bc302 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -30,6 +30,8 @@ Source:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
+# PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoenmez@suse.de -- Disable -flto on s390{x}
+Patch1:         cairo-disable-lto.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -148,9 +150,12 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
+%ifarch s390 s390x
+%patch1 -p1
+%endif
 
 %build
-# Needed by patch0
+# Needed by patch0 and patch1
 NOCONFIGURE=1 ./autogen.sh
 %configure \
     --with-pic \