diff --git a/evolution-2.12.2-invalid-include.patch b/evolution-2.12.2-invalid-include.patch
new file mode 100644
index 0000000..bcfec1a
--- /dev/null
+++ b/evolution-2.12.2-invalid-include.patch
@@ -0,0 +1,48 @@
+diff -up evolution-2.12.2/shell/es-event.c.invalid-include evolution-2.12.2/shell/es-event.c
+--- evolution-2.12.2/shell/es-event.c.invalid-include	2007-10-12 02:39:26.000000000 -0400
++++ evolution-2.12.2/shell/es-event.c	2007-12-06 15:43:14.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <glib.h>
+ 
+ #include "es-event.h"
++#include "e-shell.h"
+ 
+ static GObjectClass *eme_parent;
+ static ESEvent *es_event;
+diff -up evolution-2.12.2/shell/es-event.h.invalid-include evolution-2.12.2/shell/es-event.h
+--- evolution-2.12.2/shell/es-event.h.invalid-include	2007-10-12 02:39:26.000000000 -0400
++++ evolution-2.12.2/shell/es-event.h	2007-12-06 15:43:14.000000000 -0500
+@@ -26,13 +26,14 @@
+ #include <glib-object.h>
+ 
+ #include "e-util/e-event.h"
+-#include "e-shell.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+ #pragma }
+ #endif /* __cplusplus */
+ 
++struct _EShell;  /* Avoid including "e-shell.h" */
++
+ typedef struct _ESEvent ESEvent;
+ typedef struct _ESEventClass ESEventClass;
+ 
+@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve
+ struct _ESEventTargetShell {
+ 	EEventTarget target;
+ 
+-	EShell *shell;
++	struct _EShell *shell;
+ };
+ 
+ struct _ESEventTargetState {
+@@ -91,7 +92,7 @@ GType es_event_get_type(void);
+ ESEvent *es_event_peek(void);
+ 
+ ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
+-ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
++ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell);
+ ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
+ 
+ /* ********************************************************************** */
diff --git a/evolution.spec b/evolution.spec
index 527bc74..3b1d212 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.12.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -132,6 +132,9 @@ Patch37: evolution-2.12.1-source-changed-event.patch
 # RH bug #404591 / GN-bug #491062
 Patch38: evolution-2.12.2-auto-contacts.patch
 
+# RH bug #499920
+Patch39: evolution-2.12.2-invalid-include.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -277,6 +280,7 @@ This package contains the help for Evolution.
 %patch36 -p1 -b .icon-names
 %patch37 -p1 -b .source-changed-event
 %patch38 -p1 -b .auto-contacts
+%patch39 -p1 -b .invalid-include
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -727,6 +731,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Thu Dec 06 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.2-3.fc8
+- Add patch for GNOME bug #499920 (invalid #include, mainly for Zimbra).
+
 * Thu Nov 29 2007 Milan Crha <mcrha@redhat.com> - 2.12.2-2.fc8
 - Add patch for RH bug #404591 (do not add automatic contacts
   if disabled)