diff --git a/gnome-software-icon-crash.patch b/gnome-software-icon-crash.patch
new file mode 100644
index 0000000..bda297e
--- /dev/null
+++ b/gnome-software-icon-crash.patch
@@ -0,0 +1,26 @@
+From 2911419f0d496e3f0e8708cfed75e5cecee2226b Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Mon, 11 Apr 2016 16:53:14 -0500
+Subject: [PATCH] Don't crash if unable to find a cached icon
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764921
+---
+ src/plugins/gs-appstream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
+index 4ddd0d2..953dc7e 100644
+--- a/src/plugins/gs-appstream.c
++++ b/src/plugins/gs-appstream.c
+@@ -87,7 +87,7 @@ gs_refine_item_pixbuf (GsPlugin *plugin, GsApp *app, AsApp *item)
+ 			icon = as_app_get_icon_for_size (item, 64, 64);
+ 		if (icon == NULL) {
+ 			g_warning ("failed to find cached icon %s",
+-				   as_icon_get_name (icon));
++				   as_app_get_name (item, NULL));
+ 			return;
+ 		}
+ 		if (!as_icon_load (icon, AS_ICON_LOAD_FLAG_SEARCH_SIZE, &error)) {
+-- 
+2.6.2
+
diff --git a/gnome-software.changes b/gnome-software.changes
index f20fdbe..b9dfe9a 100644
--- a/gnome-software.changes
+++ b/gnome-software.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 11 22:06:54 UTC 2016 - mgorse@suse.com
+
+- Add gnome-software-icon-crash.patch: fix crash when unable to
+  find icon (boo#974806 bgo#764921).
+
 -------------------------------------------------------------------
 Mon Mar 21 14:42:27 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gnome-software.spec b/gnome-software.spec
index a6e40a5..780d42c 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -29,6 +29,8 @@ Source:         http://download.gnome.org/sources/gnome-software/3.20/%{name}-%{
 Patch0:         gnome-software-PK-updates.patch
 # PATCH-FEATURE-OPENSUSE gnome-software-add-default-yast-appfolder.patch boo#897713 badshah400@gmail.com -- Adds a YaST app-folder by default, in addition to existing app-folders Sundry and Utilities
 Patch1:         gnome-software-add-default-yast-appfolder.patch
+# PATCH-FIX-UPSTREAM gnome-software-icon-crash.patch boo#974806 mgorse@suse.com -- don't crash if unable to find a cached icon.
+Patch2:         gnome-software-icon-crash.patch
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  update-desktop-files
@@ -62,6 +64,7 @@ AppStore like management of Applications for your GNOME Desktop.
 # Disables - let's try the systemd offline updater
 #patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \