diff --git a/meta-atp/recipes-devtools/atp/atp-native_3.1.bb b/meta-atp/recipes-devtools/atp/atp-native_3.1.bb
index bb519882..31b58bf9 100644
--- a/meta-atp/recipes-devtools/atp/atp-native_3.1.bb
+++ b/meta-atp/recipes-devtools/atp/atp-native_3.1.bb
@@ -4,7 +4,8 @@ inherit pkgconfig native
 SUMMARY = "AMBA ATP Engine: synthetic traffic interface modelling framework"
 
 S = "${WORKDIR}/git"
-SRC_URI = "${ATP_SRC}"
+SRC_URI = "${ATP_SRC} \
+           file://no-werror.patch"
 
 EXTRA_OEMAKE += "EXTRA_CXX_FLAGS='${CXXFLAGS}' EXTRA_LD_FLAGS='${LDFLAGS}'"
 
diff --git a/meta-atp/recipes-devtools/atp/files/no-werror.patch b/meta-atp/recipes-devtools/atp/files/no-werror.patch
new file mode 100644
index 00000000..4be143af
--- /dev/null
+++ b/meta-atp/recipes-devtools/atp/files/no-werror.patch
@@ -0,0 +1,18 @@
+Don't pass -Werror, as new compilers introduce new warnings.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/Makefile b/Makefile
+index c01b120..1d3c30a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@ PROTOBUF_C_FLAGS:= $(shell pkg-config --cflags protobuf)
+ CPPUNIT_C_FLAGS := $(shell pkg-config --cflags cppunit)
+ PROTOBUF_L_FLAGS:= $(shell pkg-config --libs protobuf)
+ CPPUNIT_L_FLAGS	:= $(shell pkg-config --libs cppunit)
+-CXX_FLAGS       := $(PROTOBUF_C_FLAGS) -std=c++11 -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-variable $(CPPUNIT_C_FLAGS) -fPIC $(EXTRA_CXX_FLAGS)
++CXX_FLAGS       := $(PROTOBUF_C_FLAGS) -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable $(CPPUNIT_C_FLAGS) -fPIC $(EXTRA_CXX_FLAGS)
+ LD_FLAGS        := $(PROTOBUF_L_FLAGS) $(CPPUNIT_L_FLAGS) $(EXTRA_LD_FLAGS)
+ PROTO_SRC_DIR   := ./proto/
+ PROTO_SRC       := $(wildcard $(PROTO_SRC_DIR)tp*.proto)