diff --git a/dpdk.spec b/dpdk.spec
index 58f4dbc..432539e 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -11,7 +11,6 @@ Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}.tar.gz
 
 Patch1: dpdk-config.patch
 Patch2: enic-pun-fix.patch
-Patch3: null_array-bounds.patch
 
 Summary: Set of libraries and drivers for fast packet processing
 
@@ -73,7 +72,6 @@ API programming documentation for the Data Plane Development Kit.
 %setup -q
 %patch1 -p2 -z .config
 %patch2 -p2 -z .enic
-%patch3 -p2 -z .null
 
 %if %{with shared}
 sed -i 's:^CONFIG_RTE_BUILD_SHARED_LIB=n$:CONFIG_RTE_BUILD_SHARED_LIB=y:g' config/common_linuxapp
@@ -81,7 +79,9 @@ sed -i 's:^CONFIG_RTE_BUILD_SHARED_LIB=n$:CONFIG_RTE_BUILD_SHARED_LIB=y:g' confi
 
 
 %build
-export EXTRA_CFLAGS="%{optflags} -fPIC"
+# For the release, '-Wno-error=array-bounds' is done to prevent a spurious error
+# generated by gcc 5.X against the 2.1 branch
+export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -Wno-error=array-bounds"
 
 # DPDK defaults to using builder-specific compiler flags.  However,
 # the config has been changed by specifying CONFIG_RTE_MACHINE=default
diff --git a/null_array-bounds.patch b/null_array-bounds.patch
deleted file mode 100644
index b2b3b17..0000000
--- a/null_array-bounds.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up ./dpdk-2.1.0/drivers/net/null/rte_eth_null.c.null ./dpdk-2.1.0/drivers/net/null/rte_eth_null.c
---- ./dpdk-2.1.0/drivers/net/null/rte_eth_null.c.null	2015-08-17 13:35:37.000000000 -0400
-+++ ./dpdk-2.1.0/drivers/net/null/rte_eth_null.c	2015-08-26 10:34:03.060418807 -0400
-@@ -71,8 +71,13 @@ struct pmd_internals {
- 	unsigned nb_rx_queues;
- 	unsigned nb_tx_queues;
- 
--	struct null_queue rx_null_queues[1];
--	struct null_queue tx_null_queues[1];
-+	/*
-+ 	 * NH these should both be 1, but we want to work
-+ 	 * around a gcc compiler error here
-+ 	 * as -Werror=array-bounds trips over this when its 1
-+ 	 */
-+	struct null_queue rx_null_queues[2];
-+	struct null_queue tx_null_queues[2];
- };
- 
-