diff --git a/.kitchen.yml b/.kitchen.yml
index 8bc52a67..1b526a03 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -21,7 +21,7 @@ provisioner:
     extra_vars:
       es_major_version: "<%= ENV['VERSION'] %>"
       <% if ENV['VERSION'] == '5.x' %>
-      es_version: '5.6.10'
+      es_version: '5.6.11'
       <% end %>
   <% end %>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e589cbcb..f88384e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
+## 6.4.0 - 2018/08/24
+
+### Features
+
+* 6.4.0 as default Elasticsearch version
+
+### Fixes
+
+* [#484](https://github.com/elastic/ansible-elasticsearch/pull/484) - @kimoto - Fix downgrading Elasticsearch on RedHat hosts
+* [#476](https://github.com/elastic/ansible-elasticsearch/pull/476) - @Crazybus - Fix version locking for the elasticsearch-oss package
+
 
 ## 6.3.1 - 2018/07/05
 
-## Features
+### Features
 
-* 6.3.1 as default elasticsearch version
+* 6.3.1 as default Elasticsearch version
 
 ## 6.3.0.1 - 2018/06/28
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 2c63b070..e9a36e5b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 es_major_version: "6.x"
-es_version: "6.3.1"
+es_version: "6.4.0"
 es_use_snapshot_release: false
 es_enable_xpack: true
 es_package_name: "elasticsearch"
diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml
index 6892d3e3..d6a1bdc2 100644
--- a/tasks/elasticsearch-plugins.yml
+++ b/tasks/elasticsearch-plugins.yml
@@ -13,6 +13,12 @@
   set_fact: list_command="| grep -vE 'x-pack'"
   when: not es_plugins_reinstall
 
+- name: remove x-pack plugin directory when it isn't a plugin
+  file:
+    dest: "{{ es_home }}/plugins/x-pack"
+    state: "absent"
+  when: es_open_xpack
+
 #List currently installed plugins. We have to list the directories as the list commmand fails if the ES version is different than the plugin version.
 - name: Check installed elasticsearch plugins
   become: yes