diff --git a/appfinder-categories-nil-value.patch b/appfinder-categories-nil-value.patch
deleted file mode 100644
index d88078b..0000000
--- a/appfinder-categories-nil-value.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c
-index 483c4cc..ceba3dc 100644
---- a/src/appfinder-category-model.c
-+++ b/src/appfinder-category-model.c
-@@ -142,6 +142,7 @@ xfce_appfinder_category_model_init (XfceAppfinderCategoryModel *model)
-   /* generate a unique stamp */
-   model->stamp = g_random_int ();
-   model->icon_size = XFCE_APPFINDER_ICON_SIZE_DEFAULT_CATEGORY;
-+  model->categories = NULL;
-   model->all_applications = g_object_new (GARCON_TYPE_MENU_DIRECTORY,
-                                           "name", _("All Applications"),
-                                           "icon-name", "applications-other", NULL);
diff --git a/xfce4-appfinder-4.10.0-null-pointers.patch b/xfce4-appfinder-4.10.0-null-pointers.patch
new file mode 100644
index 0000000..fa333fd
--- /dev/null
+++ b/xfce4-appfinder-4.10.0-null-pointers.patch
@@ -0,0 +1,39 @@
+From 2a14564c8e1677c002ffac8643f706b334050988 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sat, 08 Sep 2012 09:55:19 +0000
+Subject: Protect against possible null pointers (bug #9109).
+
+(cherry picked from commit 424418316733e3f8b9b17cd7345fe6d967b06ef8)
+---
+diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c
+index 483c4cc..3f3a060 100644
+--- a/src/appfinder-category-model.c
++++ b/src/appfinder-category-model.c
+@@ -589,6 +589,7 @@ xfce_appfinder_category_model_icon_theme_changed (XfceAppfinderCategoryModel *mo
+   for (li = model->categories, idx = 0; li != NULL; li = li->next, idx++)
+     {
+       item = li->data;
++      appfinder_assert (item != NULL);
+ 
+       if (item->pixbuf != NULL)
+         {
+diff --git a/src/appfinder-window.c b/src/appfinder-window.c
+index 155e011..4f99c6a 100644
+--- a/src/appfinder-window.c
++++ b/src/appfinder-window.c
+@@ -1453,8 +1453,11 @@ xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window)
+   window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48);
+ 
+   /* drop cached pixbufs */
+-  xfce_appfinder_model_icon_theme_changed (window->model);
+-  xfce_appfinder_category_model_icon_theme_changed (window->category_model);
++  if (G_LIKELY (window->model != NULL))
++    xfce_appfinder_model_icon_theme_changed (window->model);
++
++  if (G_LIKELY (window->category_model != NULL))
++    xfce_appfinder_category_model_icon_theme_changed (window->category_model);
+ 
+   /* update state */
+   xfce_appfinder_window_entry_changed (window);
+--
+cgit v0.9.0.3
diff --git a/xfce4-appfinder.spec b/xfce4-appfinder.spec
index 438207b..7654430 100644
--- a/xfce4-appfinder.spec
+++ b/xfce4-appfinder.spec
@@ -10,7 +10,9 @@ License:        GPLv2+
 URL:            http://www.xfce.org/
 #VCS git:git://git.xfce.org/xfce/xfce4-appfinder
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0:         appfinder-categories-nil-value.patch
+# https://bugzilla.xfce.org/show_bug.cgi?id=9109
+# http://git.xfce.org/xfce/xfce4-appfinder/commit/?id=2a14564c
+Patch0:         xfce4-appfinder-4.10.0-null-pointers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.84
@@ -61,6 +63,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 06 2012 Christoph Wickert <cwickert@fedoraproject.org> - 4.10.0-3
+- Use full patch for bugzilla.xfce.org #9109 from upstream (#826486)
+
 * Wed Jul 18 2012 Cristian Ciupitu <cristian.ciupitu@yahoo.com> - 4.10.0-2
 - Patch for https://bugzilla.xfce.org/show_bug.cgi?id=9109