diff --git a/gimp-2.8.20.tar.bz2 b/gimp-2.8.20.tar.bz2
deleted file mode 100644
index 7253881..0000000
--- a/gimp-2.8.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805
-size 20853324
diff --git a/gimp-2.8.22.tar.bz2 b/gimp-2.8.22.tar.bz2
new file mode 100644
index 0000000..ad53cba
--- /dev/null
+++ b/gimp-2.8.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
+size 20873278
diff --git a/gimp.changes b/gimp.changes
index 6ab2fb2..f155a6e 100644
--- a/gimp.changes
+++ b/gimp.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri May 12 03:38:13 UTC 2017 - plinnell@opensuse.org
+
+- update to 2.8.22
+- drop upstream patches - now in the the source
+- conditionalize mypaint support
+- full change log:
+  https://git.gnome.org/browse/gimp/plain/NEWS?h=GIMP_2_8_22
+
 -------------------------------------------------------------------
 Sat Feb 25 10:45:30 UTC 2017 - mailaender@opensuse.org
 
diff --git a/gimp.spec b/gimp.spec
index 7f5be87..6fab968 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -20,7 +20,7 @@
 %global apiver 2.0
 
 Name:           gimp
-Version:        2.8.20
+Version:        2.8.22
 Release:        0
 Summary:        The GNU Image Manipulation Program
 License:        GPL-3.0+
@@ -28,10 +28,7 @@ Group:          Productivity/Graphics/Bitmap Editors
 Url:            http://www.gimp.org/
 Source:         http://download.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
 Source1:        macros.gimp
-# PATCH-FIX-UPSTREAM gimp-bgo773233-CVE-2007-3126.patch bgo#773233 CVE-2007-3126 zaitor@opensuse.org -- Fix a crash
-Patch0:         gimp-bgo773233-CVE-2007-3126.patch
-# PATCH-FIX-UPSTREAM gimp-fix-PDF-Import-filter-crash.patch bgo#593576 zaitor@opensuse.org -- Fix a crash when importing PDF's
-Patch1:         gimp-fix-PDF-Import-filter-crash.patch
+
 # openSUSE palette file
 Source2:        openSUSE.gpl
 Source99:       baselibs.conf
@@ -71,13 +68,16 @@ BuildRequires:  pkgconfig(gudev-1.0) >= 167
 BuildRequires:  pkgconfig(lcms2) >= 2.2
 BuildRequires:  pkgconfig(libexif) >= 0.6.15
 BuildRequires:  pkgconfig(libpng) >= 1.2.37
-BuildRequires:  pkgconfig(libmypaint) >= 1.3
+
 BuildRequires:  pkgconfig(pango) >= 1.29.4
 BuildRequires:  pkgconfig(poppler-glib) >= 0.12.4
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(zlib)
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(libmypaint) >= 1.3
+%endif
 # Explicitly declare the libgimp versions for upgrade purposes
 Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
@@ -207,8 +207,7 @@ This package contains the help browser for the GIMP.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+
 translation-update-upstream
 translation-update-upstream po-libgimp gimp20-libgimp
 translation-update-upstream po-python gimp20-python