diff --git a/bgo-522389-e-gw-connection-get-attachment-corruption.patch b/bgo-522389-e-gw-connection-get-attachment-corruption.patch
new file mode 100644
index 0000000..7d73aa7
--- /dev/null
+++ b/bgo-522389-e-gw-connection-get-attachment-corruption.patch
@@ -0,0 +1,18 @@
+Fixes crash on some attachments in GroupWise on x86_64 caused by stack corruption.
+http://bugzilla.gnome.org/show_bug.cgi?id=522389
+
+e-gw-connection.c: In function 'e_gw_connection_get_attachment':
+e-gw-connection.c:2649: warning: passing argument 2 of 'g_base64_decode' from incompatible pointer type
+
+================================================================================
+--- servers/groupwise/e-gw-connection.c
++++ servers/groupwise/e-gw-connection.c
+@@ -2645,7 +2645,7 @@
+ 	}
+ 
+ 	if (buffer && buf_length) {
+-		int len = atoi (buf_length) ;
++		gsize len = atoi (buf_length) ;
+ 		*attachment = g_base64_decode (buffer,&len) ;
+ 		*attach_length = len ;
+ 	}
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 67d380d..1302140 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 26 12:11:16 CET 2008 - sbrabec@suse.cz
+
+- Fixed GroupWise attachment crash on x86_64 (bgo#522389).
+
 -------------------------------------------------------------------
 Fri Mar 14 04:28:30 CET 2008 - maw@suse.de
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 7e5164e..b32a15a 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -18,7 +18,7 @@ Group:          Development/Libraries/GNOME
 AutoReqProv:    on
 Summary:        Evolution Data Server
 Version:        2.22.0
-Release:        1
+Release:        6
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.21/%{name}-%{version}.tar.bz2
 Patch0:         evolution-data-server-configure.patch
 # PATCH-FIX-UPSTREAM bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 - Fix is in upstream svn.
@@ -37,6 +37,8 @@ Patch12:        bnc-304835-ex-crash-after-restart.patch
 # PATCH-FIX-UPSTREAM: bnc-307861-calendar-auth.diff - bnc307861 bgo253574 - Fix has been submitted to bgo.
 Patch13:        bnc-307861-calendar-auth.diff 
 Patch14:        evolution-data-server-abuild.patch
+# PATCH-FIX-UPSTREAM: bgo-522389-e-gw-connection-get-attachment-corruption.patch bgo522389 - Fix gw attachment crash on x86_64
+Patch15:        bgo-522389-e-gw-connection-get-attachment-corruption.patch
 # Change patch below if we move away from /opt/gnome
 # PATCH-FIX-OPENSUSE libgnomeui-dep.patch - It avoids a build dependency on libgnomeui to speed up bootstrap
 Patch99:        libgnomeui-dep.patch
@@ -44,7 +46,7 @@ Patch99:        libgnomeui-dep.patch
 # fixed in the next release:
 # I: Program is using uninitialized variables.
 #   Note the difference between "is used" and "may be used"
-# W: evolution-data-server uninitialized-variable e-book-backend-groupwise.c: 2425                                                                             
+# W: evolution-data-server uninitialized-variable e-book-backend-groupwise.c: 2425
 # See:
 # http://bugzilla.gnome.org/show_bug.cgi?id=504346
 Url:            http://www.gnome.org
@@ -93,7 +95,7 @@ documentation.
 
 %lang_package
 %prep
-%setup -q  
+%setup -q
 %patch0
 %patch3
 #%patch4
@@ -104,6 +106,7 @@ documentation.
 ###%patch12
 %patch13
 %patch14 -p1
+%patch15
 %patch99
 
 %build
@@ -113,7 +116,7 @@ aclocal
 autoconf
 automake
 autoheader
-# needed for evolution-data-server-1.8.2:
+# needed for evolution-data-server-2.22.0:
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure\
 	--libexecdir=%{_prefix}/lib/evolution-data-server\
@@ -162,6 +165,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Mar 26 2008 sbrabec@suse.cz
+- Fixed GroupWise attachment crash on x86_64 (bgo#522389).
 * Fri Mar 14 2008 maw@suse.de
 - Update to versoin 2.22.0:
   + Bugs fixed: bgo#327851, bgo#518728, and bgo#520362