diff --git a/gnome-control-center-bnc436206-add-to-default.patch b/gnome-control-center-bnc436206-add-to-default.patch
new file mode 100644
index 0000000..12359b7
--- /dev/null
+++ b/gnome-control-center-bnc436206-add-to-default.patch
@@ -0,0 +1,18 @@
+Index: gnome-control-center-2.24.0.1/capplets/default-applications/gnome-default-applications.xml.in
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/default-applications/gnome-default-applications.xml.in
++++ gnome-control-center-2.24.0.1/capplets/default-applications/gnome-default-applications.xml.in
+@@ -241,6 +241,13 @@
+       <icon-name>sylpheed</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </mail-reader>
++    <mail-reader>
++      <_name>GroupWise</_name>
++      <executable>groupwise</executable>
++      <command>groupwise %s</command>
++      <icon-name>gwclient</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++    </mail-reader>
+   </mail-readers>
+ 
+   <terminals>
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 117748b..15b0e29 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun  1 21:59:12 CEST 2009 - sreeves@novell.com
+
+- Fix bnc#436206 - add GroupWise to the defaults
+
 -------------------------------------------------------------------
 Wed May 27 16:49:10 CEST 2009 - vuntz@novell.com
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index bdefe6a..f4835f2 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -43,7 +43,7 @@ Group:          System/GUI/GNOME
 Obsoletes:      fontilus themus acme
 Provides:       fontilus themus acme
 Version:        2.26.0
-Release:        2
+Release:        3
 Summary:        The GNOME Control Center
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
@@ -54,6 +54,8 @@ Patch14:        gnome-control-center-system-proxy-configuration.patch
 Patch28:        gnome-control-center-use-settings-menu.patch
 # PATCH-FIX-OPENSUSE gnome-control-center-bnc373197-layout-switch-keybinding.patch bnc373197 vuntz@novell.com -- this is a temporary hack to change the default layout switching keybinding
 Patch30:        gnome-control-center-bnc373197-layout-switch-keybinding.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list
+Patch31:        gnome-control-center-bnc436206-add-to-default.patch
 Url:            http://www.gnome.org
 Requires:       nautilus gnome-settings-daemon gnome-menus libcanberra-gtk
 Requires:       %{name}-lang = %{version}
@@ -98,6 +100,7 @@ Authors:
 %patch14 -p1
 %patch28
 %patch30 -p1
+%patch31 -p1
 
 %build
 autoreconf -f -i
@@ -184,6 +187,8 @@ fi
 %{_datadir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jun 01 2009 sreeves@novell.com
+- Fix bnc#436206 - add GroupWise to the defaults
 * Wed May 27 2009 vuntz@novell.com
 - Remove gnome-passwd and enable gnome-about-me instead (which
   requires --enable-aboutme in configure).