diff --git a/.gitignore b/.gitignore
index bbb58e0..929fe69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.5.2.tar.xz
 /evolution-3.5.3.tar.xz
 /evolution-3.5.3.1.tar.xz
+/evolution-3.5.4.tar.xz
diff --git a/evolution.spec b/evolution.spec
index cc571d8..b22b529 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -6,7 +6,7 @@
 %define gtkhtml_version 4.3.1
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
-%define libgweather_version 2.91.0
+%define libgweather_version 3.5.0
 %define clutter_gtk_version 0.10
 %define soup_version 2.4.0
 %define webkit_version 1.8.0
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.5.3.1
-Release: 4%{?dist}
+Version: 3.5.4
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -64,8 +64,7 @@ BuildRequires: cairo-gobject-devel
 BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
-#BuildRequires: evolution-data-server-devel >= %{version}
-BuildRequires: evolution-data-server-devel >= 3.5.3
+BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
@@ -126,8 +125,7 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-#Requires: evolution-data-server-devel >= %{version}
-Requires: evolution-data-server-devel >= 3.5.3
+Requires: evolution-data-server-devel >= %{version}
 Requires: gtk3-devel >= %{gtk3_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libgdata-devel >= %{libgdata_version}
@@ -234,7 +232,6 @@ intltoolize --force
 autoconf
 
 %configure \
-        --disable-weather \
 	--disable-maintainer-mode \
 	--disable-image-inline \
 	--enable-gtk-doc \
@@ -528,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 16 2012 Milan Crha <mcrha@redhat.com> - 3.5.4-1
+- Update to 3.5.4
+- Enable weather plugin (fixed upstream)
+
 * Wed Jun 27 2012 Matthias Clasen <mclasen@redhat.com> - 2.5.3.1-4
 - Temporarily disable weather plugin (not ported to new libgweather yet)
 
diff --git a/sources b/sources
index 3532099..5e6290d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4d483ab1a56f9808ad9bd76895326bf  evolution-3.5.3.1.tar.xz
+30a5524ac51ad14e4efd582ddfce4099  evolution-3.5.4.tar.xz