diff --git a/CHANGELOG b/CHANGELOG
index 1157075a..b1b384bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+6.4.17-rc:
+- Filter can use GHashTables directly
+- Filter can store track pointers instead of indexes
+- Remove unused set and index classes
+- Convert Collection into a playlist
+- Convert History into a playlist
+
 6.4.16:
 - Let tests run without fetching album art
 - Don't try to read data from nonexistant playlists
diff --git a/Sconstruct b/Sconstruct
index a127e713..bb928683 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import os
 
-CONFIG_VERSION = "6.4.16"
+CONFIG_VERSION = "6.4.17-rc"
 
 
 # Set up default environment