diff --git a/oprofile-1.1.0-gcc6.patch b/oprofile-1.1.0-gcc6.patch
deleted file mode 100644
index 0640d77..0000000
--- a/oprofile-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: William Cohen <wcohen@redhat.com>
-Subject: Fix FTBFS problem with GCC-6
-Date: 2016-02-05
-References: boo#985359
-Upstream: yes
-
-GCC-6 is pickier about some of the type conversions.
-Avoid the intermediate bool type to make GCC-6 happy.
-
-Index: b/libutil++/op_bfd.cpp
-===================================================================
---- a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_ind
- {
- 	op_bfd_symbol const & sym = syms[sym_idx];
- 
--	bool const verbose = cverb << (vbfd & vlevel1);
--
- 	if (anon_obj)
- 		start = sym.vma();
- 	else
- 		start = sym.filepos();
- 	end = start + sym.size();
- 
--	if (!verbose)
-+	if (!(cverb << (vbfd & vlevel1)))
- 		return;
- 
- 	io_state state(cverb << (vbfd & vlevel1));
diff --git a/oprofile-1.1.0.tar.gz b/oprofile-1.1.0.tar.gz
deleted file mode 100644
index d0534a6..0000000
--- a/oprofile-1.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c
-size 1468502
diff --git a/oprofile-1.2.0.tar.gz b/oprofile-1.2.0.tar.gz
new file mode 100644
index 0000000..a580784
--- /dev/null
+++ b/oprofile-1.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb95f98c40b7d0ee29b45fba3565d9f8381747528aa6b6159e37d4fa0c8ca57d
+size 1533343
diff --git a/oprofile.changes b/oprofile.changes
index e5e2300..15b5a4e 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Aug  7 23:54:02 UTC 2017 - tonyj@suse.com
+
+- Update to version 1.2.0
+  - New/updated Processor Support
+    * ARM Cortex A17
+    * IBM Power 9
+    * IBM Power 8NV and NVL variants
+    * IBM z13
+    * Intel Goldmont
+    * Intel Kabylake
+    * Intel Xeon Phi (Knights Landing)
+    * Achitecture specific events for Applied Micro X-Gene
+  - Bug fixes
+    * #286 - Compilation error: left shift of negative value
+    * #288 - oprofile fails to build with --enable-pch and gcc-6.2
+  - Other fixes
+    * Fixed compile warning and errors when using GCC 6 or GCC 7
+    * Avoid using deprecated readdir_r function
+    * Store samples in the archive and search the appropriate places
+      for samples
+    * Only start the application if the perf events setup was successful
+    * Corrections in the code and i386 events so "make check" tests pass
+
+- Drop local patch oprofile-1.1.0-gcc6.patch (upstream)
+
 -------------------------------------------------------------------
 Sat May 20 19:14:15 UTC 2017 - tchvatal@suse.com
 
diff --git a/oprofile.spec b/oprofile.spec
index d5bbf50..fdee42c 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -17,7 +17,7 @@
 
 
 Name:           oprofile
-Version:        1.1.0
+Version:        1.2.0
 Release:        0
 Summary:        System-Wide Profiler for Linux Systems
 License:        GPL-2.0+ and LGPL-2.1+
@@ -30,8 +30,6 @@ Source4:        jvmpi.h
 Source5:        README-BEFORE-ADDING-PATCHES
 Patch1:         %{name}-no-libjvm-version.patch
 Patch2:         %{name}-pfm-ppc.patch
-# PATCH FIX UPSTREAM marguerite@opensuse.org - fix FTBFS gcc6
-Patch3:         %{name}-%{version}-gcc6.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  binutils-devel
@@ -104,7 +102,6 @@ from supported virtual machines.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 mkdir -p java/include
 # copy files necessary to build Java agent libraries