diff --git a/fwts-V16.08.00.tar.gz b/fwts-V16.08.00.tar.gz
deleted file mode 100644
index 65626b4..0000000
--- a/fwts-V16.08.00.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28023e875961443627386e7023c83cb167b117ba559fea953f67ea81632b740c
-size 3475102
diff --git a/fwts-V16.09.00.tar.gz b/fwts-V16.09.00.tar.gz
new file mode 100644
index 0000000..4773c1a
--- /dev/null
+++ b/fwts-V16.09.00.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bab7a9daa6def8951b160e9f2c14b203459881d0a1279cb19329bec727c9f2d
+size 3479316
diff --git a/fwts.changes b/fwts.changes
index 5445b49..4a225c3 100644
--- a/fwts.changes
+++ b/fwts.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sun Sep 11 07:14:21 UTC 2016 - mpluskal@suse.com
+
+- Update to version 06.09.00:
+  * lib: acpi: add supports for WPBT 
+  * acpi: wpbt: add ACPI WPBT test 
+  * lib: acpi: add supports for DRTM 
+  * acpi: drtm: add ACPI DRTM test 
+  * lib: fwts_guid: add a compare function 
+  * acpi: nfit: check fields equals 0 for Virtual CD and Disk 
+  * opal: mtd: Add OPAL MTD Validation 
+  * acpi: ACPI Platform check updates 
+  * acpi: fadt: Remove HEADLESS check on reduced hardware 
+  * pci: aspm: Add segment support 
+  * ACPICA: Update to version 20160831 
+  * lots of bugs fixed
+- Drop no longer needed json-c-includes.patch
+- Exclude s390x from building
+
 -------------------------------------------------------------------
 Thu Aug 18 08:57:14 UTC 2016 - mpluskal@suse.com
 
diff --git a/fwts.spec b/fwts.spec
index d93698d..559197e 100644
--- a/fwts.spec
+++ b/fwts.spec
@@ -17,14 +17,13 @@
 
 
 Name:           fwts
-Version:        16.08.00
+Version:        16.09.00
 Release:        0
 Summary:        Firmware Test Suite
 License:        GPL-2.0+
 Group:          Development/Tools/Other
 Url:            https://wiki.ubuntu.com/Kernel/Reference/fwts
 Source0:        http://fwts.ubuntu.com/release/%{name}-V%{version}.tar.gz
-Patch0:         json-c-includes.patch
 # PATCH-FIX-OPENSUSE fwts-no-compiletime.patch
 Patch1:         fwts-no-compiletime.patch
 BuildRequires:  autoconf
@@ -41,7 +40,7 @@ BuildRequires:  pkgconfig(libpcre)
 Requires:       acpica
 Requires:       dmidecode
 Requires:       pciutils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExcludeArch:    s390x
 
 %description
 The FirmWare Test Suite (fwts) is a tool to do automatic testing of a PC's
@@ -53,7 +52,6 @@ issues.
 
 %prep
 %setup -q -c %{name}-%{version}
-%patch0
 %patch1
 
 %build
diff --git a/json-c-includes.patch b/json-c-includes.patch
deleted file mode 100644
index fb23e2b..0000000
--- a/json-c-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: src/lib/include/fwts_json.h
-===================================================================
---- src/lib/include/fwts_json.h.orig
-+++ src/lib/include/fwts_json.h
-@@ -20,7 +20,7 @@
- #ifndef __FWTS_JSON_H__
- #define __FWTS_JSON_H__
- 
--#include <json.h>
-+#include <json-c/json.h>
- 
- #define __FWTS_JSON_ERR_PTR__ ((json_object*) -1)
- /*
-Index: src/utilities/kernelscan.c
-===================================================================
---- src/utilities/kernelscan.c.orig
-+++ src/utilities/kernelscan.c
-@@ -25,7 +25,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <regex.h>
--#include <json.h>
-+#include <json-c/json.h>
- 
- #include "config.h"
-