diff --git a/CHANGELOG.md b/CHANGELOG.md
index edba414e372..944db1227cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+* **2017-10-16 Release 5.5.0.4 Elasticsearch 5.5.0 + Cassandra 3.11.1.0**
 * **2017-10-10 Release 5.5.0.3 Elasticsearch 5.5.0 + Cassandra 3.11.0.1**
 * **2017-10-03 Release 5.5.0.2 Elasticsearch 5.5.0 + Cassandra 3.11.0.1**
   * Debian packaging
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cf33054e0c..678d69f0017 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+5.5.0.4 - 2017-10-16
+  * Upgrade to Cassandra 3.11.1
+  * Fix #128 fetch multiple CQL types
+  * Fix dependencies for Cassandra UDF
+
 5.5.0.3 - 2017-10-11
   * Improve performances on GET operations.
   * Fix startup when metadata is empty.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index f6b2275d654..0b3318aff76 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,6 +1,6 @@
 elasticsearch     = 5.5.0
 lucene            = 6.6.0
-elassandra        = 3
+elassandra        = 4
 
 # optional dependencies
 spatial4j         = 0.6