diff --git a/cfengine.changes b/cfengine.changes
index 0bab9a3..429d3a9 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Jan 28 06:58:12 UTC 2015 - kkaempf@suse.com
+
+- Update to 3.6.4
+  Features:
+  - Introduced users promises support on HP-UX platform.
+  - Introduced process promises support on HP-UX platform.
+
+  Bug fixes:
+  - Fixed bug on FreeBSD which sometimes led to the wrong process being
+    killed (Redmine #2330)
+  - Fixed package version comparison sometimes failing with rpm package
+    manager (Redmine #6807)
+  - Fixed a bug in users promises which would sometimes set the wrong
+    password hash if the user would also be unlocked at the same time.
+  - Fixed a bug on AIX which would occationally kill the wrong process.
+  - Improved error message for functions that require an absolute path.
+    (Redmine #6877)
+  - Fixed some spelling errors in examples.
+  - Fixed error in out-of-tree builds when building cf-upgrade.
+  - Fixed a bug which would make cf-agent exit with an error if it was
+    built with a custom log directory, and that directory did not exist.
+  - Fixed ordering of evaluating promises when depends_on is used.
+    (Redmine #6484, Redmine #5462)
+  - Skip non-empty directories silently when recursively deleting.
+    (Redmine #6331)
+  - Fix memory exhaustion with list larger than 4994 items.
+    (Redmine # 6672)
+  - Fix cf-execd segfault on IP address detection (Redmine #6905).
+  - Fix hard class detection of RHEL6 ComputeNode (Redmine #3148).      
+
 -------------------------------------------------------------------
 Sat Dec  6 12:28:41 UTC 2014 - kkaempf@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index 4ef976d..1bc9bdc 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cfengine
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
 %define with_libvirt 0
 
 Name:           cfengine
-Version:        3.6.3
+Version:        3.6.4
 Release:        0
 %define         srcname core-%{version}
 %define         libname   libpromises
diff --git a/core-3.6.3.tar.gz b/core-3.6.3.tar.gz
deleted file mode 100644
index 66f1212..0000000
--- a/core-3.6.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bad1279bb8858342a6c56208c74a9fc385596ae8788ad086db08299a1a82499
-size 1496686
diff --git a/core-3.6.4.tar.gz b/core-3.6.4.tar.gz
new file mode 100644
index 0000000..8b851e1
--- /dev/null
+++ b/core-3.6.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aad444a5ff9dbb54b8f554a62d39d272f219fdcdedaa31aacd242d568411a8c4
+size 1542191