diff --git a/0001-embed-remove-non-double-buffer-setting.patch b/0001-embed-remove-non-double-buffer-setting.patch
new file mode 100644
index 0000000..c00e094
--- /dev/null
+++ b/0001-embed-remove-non-double-buffer-setting.patch
@@ -0,0 +1,33 @@
+From 88d74c56612773dc350efde57eff97f461f438e6 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Mon, 29 Aug 2016 19:36:48 +0100
+Subject: [PATCH] embed: remove non double buffer setting
+
+This started causing problems with Gtk+ 3.21. As the documentation explains,
+disabling double buffering might trigger rendering issues.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769097
+---
+ clutter-gtk/gtk-clutter-embed.c | 5 -----
+ configure.ac                    | 2 +-
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
+index 9a01b9e..521afc9 100644
+--- a/clutter-gtk/gtk-clutter-embed.c
++++ b/clutter-gtk/gtk-clutter-embed.c
+@@ -1153,11 +1153,6 @@ gtk_clutter_embed_init (GtkClutterEmbed *embed)
+   /* we accept key focus */
+   gtk_widget_set_can_focus (widget, TRUE);
+ 
+-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+-  /* disable double-buffering: it's automatically provided by OpenGL */
+-  gtk_widget_set_double_buffered (widget, FALSE);
+-  G_GNUC_END_IGNORE_DEPRECATIONS
+-
+   /* we own the whole drawing of this widget, including the background */
+   gtk_widget_set_app_paintable (widget, TRUE);
+ 
+-- 
+2.7.4
+
diff --git a/clutter-gtk.spec b/clutter-gtk.spec
index e8df07d..0de3ff0 100644
--- a/clutter-gtk.spec
+++ b/clutter-gtk.spec
@@ -1,17 +1,19 @@
 %global         clutter_version 1.23.7
-%global         gtk3_version 3.19.4
+%global         gtk3_version 3.21.0
 
 %global         api_ver 1.0
 
 Name:           clutter-gtk
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
 Source0:        http://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-%{version}.tar.xz
+# Backported from upstream
+Patch0:         0001-embed-remove-non-double-buffer-setting.patch
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
@@ -37,6 +39,7 @@ clutter-gtk.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -73,6 +76,9 @@ make check %{?_smp_mflags} V=1
 %{_datadir}/gtk-doc/html/clutter-gtk-1.0
 
 %changelog
+* Mon Sep 05 2016 Kalev Lember <klember@redhat.com> - 1.8.0-2
+- embed: remove non double buffer setting
+
 * Wed Mar 30 2016 Kalev Lember <klember@redhat.com> - 1.8.0-1
 - Update to 1.8.0
 - Set minimum required gtk3 version