diff --git a/0001-protocol-add-wl_surface-errors-enum-for-bad-scale-an.patch b/0001-protocol-add-wl_surface-errors-enum-for-bad-scale-an.patch
new file mode 100644
index 0000000..f017824
--- /dev/null
+++ b/0001-protocol-add-wl_surface-errors-enum-for-bad-scale-an.patch
@@ -0,0 +1,53 @@
+From 0dd019925b88ffee895aa426826f06b20804a758 Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny.lamb@collabora.co.uk>
+Date: Fri, 30 May 2014 12:08:16 +0200
+Subject: [PATCH] protocol: add wl_surface errors enum for bad scale and
+ transform values
+
+---
+ protocol/wayland.xml | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/protocol/wayland.xml b/protocol/wayland.xml
+index 22eb6e7..d84b356 100644
+--- a/protocol/wayland.xml
++++ b/protocol/wayland.xml
+@@ -977,6 +977,14 @@
+       cursor images for pointers, drag icons, etc.
+     </description>
+ 
++    <enum name="error">
++      <description summary="wl_surface error values">
++        These errors can be emitted in response to wl_surface requests.
++      </description>
++      <entry name="invalid_scale" value="0" summary="buffer scale value is invalid"/>
++      <entry name="invalid_transform" value="1" summary="buffer transform value is invalid"/>
++    </enum>
++
+     <request name="destroy" type="destructor">
+       <description summary="delete surface">
+ 	Deletes the surface and invalidates its object ID.
+@@ -1229,6 +1237,10 @@
+ 	Note that if the transform value includes 90 or 270 degree rotation,
+ 	the width of the buffer will become the surface height and the height
+ 	of the buffer will become the surface width.
++
++	If transform is not one of the values from the
++	wl_output.transform enum the invalid_transform protocol error
++	is raised.
+       </description>
+       <arg name="transform" type="int"/>
+     </request>
+@@ -1257,6 +1269,9 @@
+ 	Note that if the scale is larger than 1, then you have to attach
+ 	a buffer that is larger (by a factor of scale in each dimension)
+ 	than the desired surface size.
++
++	If scale is not positive the invalid_scale protocol error is
++	raised.
+       </description>
+       <arg name="scale" type="int"/>
+     </request>
+-- 
+2.0.0
+
diff --git a/wayland.spec b/wayland.spec
index 3f9bb67..e4c3240 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -2,7 +2,7 @@
 
 Name:           wayland
 Version:        1.5.0
-Release:        3%{?gitdate:.%{gitdate}}%{?dist}
+Release:        4%{?gitdate:.%{gitdate}}%{?dist}
 Summary:        Wayland Compositor Infrastructure
 
 Group:          User Interface/X
@@ -15,6 +15,8 @@ Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.x
 %endif
 Source1:        make-git-snapshot.sh
 
+Patch1: 0001-protocol-add-wl_surface-errors-enum-for-bad-scale-an.patch
+
 BuildRequires:  autoconf automake libtool
 BuildRequires:  doxygen
 BuildRequires:  pkgconfig(libffi)
@@ -82,6 +84,7 @@ Headers and symlinks for developing wayland server applications.
 
 %prep
 %setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch1 -p1
 
 %build
 autoreconf -v --install
@@ -165,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/wayland-server.pc
 
 %changelog
+* Wed Jul 02 2014 Adam Jackson <ajax@redhat.com> 1.5.0-4
+- Update protocol: new surface error enums
+
 * Mon Jun 30 2014 Adam Jackson <ajax@redhat.com> 1.5.0-3
 - Remove blocking flush patch as it actually introduces deadlocks now