diff --git a/evolution-3.5.92.tar.xz b/evolution-3.5.92.tar.xz
deleted file mode 100644
index 7306431..0000000
--- a/evolution-3.5.92.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfead9f5bde36527ed4410e62004e42d4677e319d2c6e02d96ede5406516c25f
-size 12031424
diff --git a/evolution-3.6.0.tar.xz b/evolution-3.6.0.tar.xz
new file mode 100644
index 0000000..eae1c6c
--- /dev/null
+++ b/evolution-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6163ef56a22ca7c605a89d774851c9988d7840a4dc5c73c546308e5380cfe7b4
+size 12021428
diff --git a/evolution.changes b/evolution.changes
index 000a650..2a72c43 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Sep 23 09:45:37 UTC 2012 - coolo@suse.com
+
+- Replace ';' with 'and' in license tag.
+
+-------------------------------------------------------------------
+Sun Sep 23 09:39:03 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 3.6.0:
+  + WebKit renders frames with plain/text parts too small
+    (bgo#678408).
+  + Updated translations.
+
 -------------------------------------------------------------------
 Sun Sep 16 20:58:04 UTC 2012 - dimstar@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 9f92709..1973e24 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -25,15 +25,15 @@
 Name:           evolution
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 3.6
-Version:        3.5.92
+Version:        3.6.0
 Release:        0
 # FIXME: check if note on license is still valid (comment before license)
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
-License:        LGPL-2.0 ; LGPL-3.0
+License:        LGPL-2.0 and LGPL-3.0
 Group:          Productivity/Networking/Email/Clients
 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
 Url:            http://gnome.org/projects/evolution/
-Source0:        http://download.gnome.org/sources/evolution/3.5/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %%{_libdir}/evoldap/include
 Patch15:        evolution-custom-openldap-includes.patch
 # PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM)