diff --git a/gnome-disk-utility-3.5.3-Replace-Werror-foo-with-Wfoo.patch b/gnome-disk-utility-3.5.3-Replace-Werror-foo-with-Wfoo.patch
new file mode 100644
index 0000000..0b4ecd6
--- /dev/null
+++ b/gnome-disk-utility-3.5.3-Replace-Werror-foo-with-Wfoo.patch
@@ -0,0 +1,30 @@
+From 196c25d2a01e905b4f03baf6414155a755fd16eb Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@gmail.com>
+Date: Fri, 27 Jul 2012 14:33:01 -0400
+Subject: [PATCH] Replace -Werror=foo with -Wfoo
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ae56f84..c161cbc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,9 +35,9 @@ CC_CHECK_CFLAGS_APPEND([                          \
+         -Wcast-align                              \
+         -Wdeclaration-after-statement             \
+         -Wendif-labels                            \
+-        -Werror=format-security                   \
+-        -Werror=implicit-function-declaration     \
+-        -Werror=overflow                          \
++        -Wformat-security                         \
++        -Wimplicit-function-declaration           \
++        -Woverflow                                \
+         -Wformat-nonliteral                       \
+         -Wformat=2                                \
+         -Wimplicit                                \
+-- 
+1.7.11.2
+
diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec
index a83f97a..e43c5c8 100644
--- a/gnome-disk-utility.spec
+++ b/gnome-disk-utility.spec
@@ -2,15 +2,22 @@
 %define gtk3_version              3.3.11
 %define udisks_version            1.99.0
 
+# Only enable if using patches that touches configure.ac,
+# Makefile.am or other build system related files
+#
+%define enable_autoreconf 1
+
 Summary: Disks
 Name: gnome-disk-utility
 Version: 3.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/browse/gnome-disk-utility
 Source0: http://download.gnome.org/sources/gnome-disk-utility/3.5/%{name}-%{version}.tar.xz
 
+Patch0: gnome-disk-utility-3.5.3-Replace-Werror-foo-with-Wfoo.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gettext
@@ -35,6 +42,12 @@ Obsoletes: gnome-disk-utility-ui-libs
 Obsoletes: gnome-disk-utility-ui-devel
 Obsoletes: gnome-disk-utility-nautilus
 
+%if 0%{?enable_autoreconf}
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+%endif
+
 %description
 This package contains the Disks and Disk Image Mounter applications.
 Disks supports partitioning, file system creation, encryption,
@@ -42,8 +55,12 @@ fstab/crypttab editing, ATA SMART and other features
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%if 0%{?enable_autoreconf}
+autoreconf
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -89,6 +106,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 %doc README AUTHORS NEWS COPYING
 
 %changelog
+* Fri Jul 27 2012 David Zeuthen <davidz@redhat.com> - 3.5.3-2%{?dist}
+- Avoid treating warnings as errors
+
 * Fri Jul 27 2012 David Zeuthen <davidz@redhat.com> - 3.5.3-1%{?dist}
 - Update to 3.5.3