diff --git a/.gitignore b/.gitignore
index ba5a492..04ce141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,10 @@ evolution-2.31.5.tar.bz2
 /evolution-3.7.5.tar.xz
 /evolution-3.7.90.tar.xz
 /evolution-3.7.91.tar.xz
+/evolution-3.7.92.tar.xz
+/evolution-3.8.0.tar.xz
+/evolution-3.8.1.tar.xz
+/evolution-3.8.2.tar.xz
+/evolution-3.8.3.tar.xz
+/evolution-3.8.4.tar.xz
+/evolution-3.8.5.tar.xz
diff --git a/evolution-3.8.5-cert-viewer-crash.patch b/evolution-3.8.5-cert-viewer-crash.patch
new file mode 100644
index 0000000..9f0b3fa
--- /dev/null
+++ b/evolution-3.8.5-cert-viewer-crash.patch
@@ -0,0 +1,12 @@
+diff -up evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash evolution-3.8.5/smime/gui/certificate-viewer.c
+--- evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash	2013-07-23 14:52:23.000000000 +0200
++++ evolution-3.8.5/smime/gui/certificate-viewer.c	2013-08-12 09:19:29.826358628 +0200
+@@ -538,7 +538,7 @@ get_window_title (CERTCertificate *cert)
+ 		return title;
+ 	}
+ 
+-	return cert->subjectName;
++	return g_strdup (cert->subjectName);
+ }
+ 
+ GtkWidget *
diff --git a/evolution.spec b/evolution.spec
index fc5dffc..52b5e9e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,3 +1,5 @@
+%global _changelog_trimtime %(date +%s -d "1 year ago")
+
 %define glib2_version 2.34.0
 %define gtk3_version 3.4.0
 %define gtkhtml_version 4.5.2
@@ -28,14 +30,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.7.91
-Release: 1%{?dist}
+Version: 3.8.5
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/3.7/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -49,6 +51,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+# RH bug #995516
+Patch03: evolution-3.8.5-cert-viewer-crash.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -190,6 +195,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
+%patch03 -p1 -b .cert-viewer-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -317,7 +323,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f translations.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 
 # GSettings schemas:
 %{_datadir}/GConf/gsettings/evolution.convert
@@ -515,6 +521,39 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 12 2013 Milan Crha <mcrha@redhat.com> - 3.8.5-2
+- Add patch for RH bug #995516 (Crash in certificate viewer)
+
+* Sun Aug 11 2013 Matthew Barnes <mbarnes@redhat.com> - 3.8.5-1
+- Update to 3.8.5
+- Remove patches from 3.8.4-2 update (both fixed upstream).
+
+* Wed Jul 31 2013 Milan Crha <mcrha@redhat.com> - 3.8.4-2
+- Add patch to not use custom alarm messages if backend doesn't support it
+- Add patch for GNOME bug #705119 (File descriptors for images not closed)
+
+* Tue Jul 23 2013 Milan Crha <mcrha@redhat.com> - 3.8.4-1
+- Update to 3.8.4
+
+* Sat Jun 22 2013 Matthias Clasen <mclasen@redhat.com> - 3.8.3-2
+- Don't install ChangeLog
+- Trim %%changelog
+
+* Mon Jun 10 2013 Milan Crha <mcrha@redhat.com> - 3.8.3-1
+- Update to 3.8.3
+
+* Sun May 12 2013 Matthew Barnes <mbarnes@redhat.com> - 3.8.2-1
+- Update to 3.8.2
+
+* Sun Apr 14 2013 Matthew Barnes <mbarnes@redhat.com> - 3.8.1-1
+- Update to 3.8.1
+
+* Mon Mar 25 2013 Milan Crha <mcrha@redhat.com> - 3.8.0-1
+- Update to 3.8.0
+
+* Mon Mar 18 2013 Milan Crha <mcrha@redhat.com> - 3.7.92-1
+- Update to 3.7.92
+
 * Mon Mar 04 2013 Milan Crha <mcrha@redhat.com> - 3.7.91-1
 - Update to 3.7.91
 
@@ -540,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 3.7.3.2-2
 - Rebuilt for libgnome-desktop3 3.7.3 soname bump
 
-* Tue Dec 19 2012 Matthew Barnes <mbarnes@redhat.com> - 3.7.3.2-1
+* Wed Dec 19 2012 Matthew Barnes <mbarnes@redhat.com> - 3.7.3.2-1
 - Update to 3.7.3.2
 - Remove obsolete BuildRequires:
     bison
diff --git a/sources b/sources
index b841fe6..f666969 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51749a034e3990a93b4d0701d8fc0f1c  evolution-3.7.91.tar.xz
+5ba2002066100c8e9fe28b78bb34f536  evolution-3.8.5.tar.xz