diff --git a/0001-Fix-829-segfault-with-clutter-gtk.patch b/0001-Fix-829-segfault-with-clutter-gtk.patch
new file mode 100644
index 0000000..691b2a0
--- /dev/null
+++ b/0001-Fix-829-segfault-with-clutter-gtk.patch
@@ -0,0 +1,35 @@
+From f34ea0700048c27319a2256408171adda32a7580 Mon Sep 17 00:00:00 2001
+From: Colin Clark <colin.clark@cclark.uk>
+Date: Sat, 9 Jan 2021 11:35:41 +0000
+Subject: [PATCH] Fix #829: segfault with clutter-gtk
+
+https://github.com/BestImageViewer/geeqie/issues/829
+
+This fix might cause other problems which might be cured by calling:
+LIBGL_ALWAYS_INDIRECT=1 geeqie
+
+or, worst case:
+geeqie --disable-clutter
+---
+ src/main.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index f497240d..4af654fe 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[])
+ #ifdef HAVE_GTHREAD
+ #if !GLIB_CHECK_VERSION(2,32,0)
+ 	g_thread_init(NULL);
+-#endif
+-#ifdef HAVE_CLUTTER
+-/* FIXME: see below */
+-	putenv("LIBGL_ALWAYS_INDIRECT=1");
+-	XInitThreads();
+ #endif
+ 	gdk_threads_init();
+ 	gdk_threads_enter();
+-- 
+2.29.2
+
diff --git a/geeqie.changes b/geeqie.changes
index 9bcbdac..93b15fb 100644
--- a/geeqie.changes
+++ b/geeqie.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan  9 12:09:05 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Add upstream patch to fix crash with clutter-gtk (boo#1180228)
+  + 0001-Fix-829-segfault-with-clutter-gtk.patch
+
 -------------------------------------------------------------------
 Thu Dec  3 14:14:57 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/geeqie.spec b/geeqie.spec
index 27ec6cf..dba4f59 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package geeqie
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ URL:            http://www.geeqie.org
 Source0:        %{url}/%{name}-%{version}.tar.xz
 Source1:        %{url}/%{name}-%{version}.tar.xz.asc
 Source2:        geeqie.keyring
+Patch0:         0001-Fix-829-segfault-with-clutter-gtk.patch
 
 BuildRequires:  c++_compiler
 BuildRequires:  fdupes