diff --git a/kill-werror.patch b/kill-werror.patch
new file mode 100644
index 0000000..740bf13
--- /dev/null
+++ b/kill-werror.patch
@@ -0,0 +1,10 @@
+--- open-vm-tools-10.0.0-3000743/configure.ac.old	2015-09-10 08:31:38.000000000 +0100
++++ open-vm-tools-10.0.0-3000743/configure.ac	2016-04-23 07:45:08.405052511 +0100
+@@ -935,7 +935,6 @@
+ 
+ ### General flags / actions
+ CFLAGS="$CFLAGS -Wall"
+-CFLAGS="$CFLAGS -Werror"
+ 
+ # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
+ # in Xlib.h on OpenSolaris.
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 115b31b..023e183 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 Group:            Applications/System
 License:          GPLv2
@@ -42,6 +42,9 @@ ExclusiveArch:    x86_64
 ExclusiveArch:    %{ix86} x86_64
 %endif
 
+# Kill -Werror.  Upstreams: Please do not use -Werror as the default.
+Patch1:           kill-werror.patch
+
 BuildRequires:          autoconf
 BuildRequires:          automake
 BuildRequires:          libtool
@@ -116,6 +119,8 @@ VMware virtual machines.
 %prep
 %setup -q -n %{name}-%{version}-%{toolsbuild}
 
+%patch1 -p1
+
 %build
 # Fedora 23 uses libsigc++-2.0 version 2.6.1.
 # libsigc++-2.0 >= 2.5.1 requires C++11. Using
@@ -127,6 +132,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++11"
 # Required for regenerating configure script when
 # configure.ac get modified
 autoreconf -i
+autoconf
 
 # configure from open-vm-tools 9.10.2 is missing 'x' bit
 chmod a+x configure
@@ -281,6 +287,9 @@ fi
 %{_libdir}/libvmtools.so
 
 %changelog
+* Sat Apr 23 2016 Richard W.M. Jones <rjones@redhat.com> - 10.0.0-11
+- Kill -Werror with fire (RHBZ#1305108).
+
 * Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 10.0.0-10
 - rebuild for ICU 57.1