diff --git a/evolution-3.18.3.tar.xz b/evolution-3.18.3.tar.xz
deleted file mode 100644
index 72815dd..0000000
--- a/evolution-3.18.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9
-size 12057880
diff --git a/evolution-3.18.4.tar.xz b/evolution-3.18.4.tar.xz
new file mode 100644
index 0000000..cbfc51c
--- /dev/null
+++ b/evolution-3.18.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb
+size 12062432
diff --git a/evolution.changes b/evolution.changes
index 8dd43aa..ea87938 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jan 18 13:42:06 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.18.4:
+  + EHTMLEditorView:
+    - Allow to append a query to the link.
+    - Cannot append text to links if non-breaking space is
+      presented.
+    - Extra new line added after pressing the Backspace in a list
+      item with one character.
+    - History can be overwritten when redoing the Return key press
+      in an empty list item.
+    - Redoing the Return key press in the list can fail.
+    - Pressing the Return key in the bulleted list does not end
+      it.
+    - Cannot remove an empty bulleted list item with Backspace key.
+    - Only change a smiley to plain text when the node is smiley.
+  + Address crashes related to second instance execution.
+  + Bugs fixed: bgo#759584, bgo#759564, bgo#760365.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Dec 15 13:30:00 UTC 2015 - zaitor@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 3f8382a..534ce92 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package evolution
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 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.18
-Version:        3.18.3
+Version:        3.18.4
 Release:        0
 # _version needs to be %{version} stripped to major.minor.micro only...
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')