diff --git a/gtk+-3.21.6.tar.xz b/gtk+-3.21.6.tar.xz
deleted file mode 100644
index 51afd31..0000000
--- a/gtk+-3.21.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c03cd371baf31448d99af80f3b1354f0687db4859f2c199533684714f427c864
-size 20796060
diff --git a/gtk+-3.22.0.tar.xz b/gtk+-3.22.0.tar.xz
new file mode 100644
index 0000000..78a5e02
--- /dev/null
+++ b/gtk+-3.22.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88d0bb584be7ecec965b82ba88a9cf0aafd6f03eff7447653295ab2341c74134
+size 20787268
diff --git a/gtk3-widget-warn-consistency-check-only.patch b/gtk3-widget-warn-consistency-check-only.patch
new file mode 100644
index 0000000..6edae80
--- /dev/null
+++ b/gtk3-widget-warn-consistency-check-only.patch
@@ -0,0 +1,13 @@
+Index: gtk+-3.22.0/gtk/gtkwidget.c
+===================================================================
+--- gtk+-3.22.0.orig/gtk/gtkwidget.c
++++ gtk+-3.22.0/gtk/gtkwidget.c
+@@ -6998,7 +6998,7 @@ gtk_widget_draw_internal (GtkWidget *wid
+       if (push_group)
+         cairo_push_group (cr);
+ 
+-#ifdef G_ENABLE_DEBUG
++#ifdef G_ENABLE_CONSISTENCY_CHECKS
+       if (_gtk_widget_get_alloc_needed (widget))
+         g_warning ("%s %p is drawn without a current allocation. This should not happen.", G_OBJECT_TYPE_NAME (widget), widget);
+ #endif
diff --git a/gtk3.changes b/gtk3.changes
index b80818d..ae5b76a 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Sep 20 14:05:03 UTC 2016 - dimstar@opensuse.org
+
+- Add gtk3-widget-warn-consistency-check-only.patch: widget: Only
+  warn about missing allocation if G_ENABLE_CONSISTENCY_CHECKS. The
+  previously chosen G_ENABLE_DEBUG is by default set on gtk+ unless
+  it is explicitly disabled by configure --disable-debug. As the
+  default is too noisy, we move it to a flag that is only switched
+  on by configure --enable-debug.
+
+-------------------------------------------------------------------
+Mon Sep 19 23:07:34 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.22.0:
+  + Reduce some noisy warnings.
+  + Improve positioning and sizing of popups on Wayland.
+  + Update Adwaita assets.
+  + Bugs fixed: bgo#602773, bgo#771117, bgo#771349, bgo#771568,
+    bgo#771561.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Sep 13 19:19:33 UTC 2016 - zaitor@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index ca25057..6b434d0 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -29,13 +29,13 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.21.6
+Version:        3.22.0
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.gtk.org/
-Source:         http://download.gnome.org/sources/gtk+/3.21/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz
 Source1:        README.SUSE
 Source2:        settings.ini
 Source3:        macros.gtk3
@@ -44,6 +44,8 @@ Source99:       baselibs.conf
 Patch0:         gtk3-GTK_PATH64.patch
 # PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE
 Patch1:         gtk3-path-local.patch
+# PATCH-FIX-UPSTREAM gtk3-widget-warn-consistency-check-only.patch dimstar@opensuse.org -- : widget: Only warn about missing allocation if G_ENABLE_CONSISTENCY_CHECKS.
+Patch2:         gtk3-widget-warn-consistency-check-only.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -339,6 +341,7 @@ cp -a %{S:1} .
 %endif
 # Patch disabled, needs rebase.
 #patch1 -p0
+%patch2 -p1
 
 %build
 # Disabled since patch 1 is in need of rebase