diff --git a/NEWS.txt b/NEWS.txt
index f297634115..97d32f2381 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,14 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+1.2.17
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 1.2.16 if you are upgrading
+      from a previous version.
+
 
 1.2.16
 ======
diff --git a/build.xml b/build.xml
index 5db0a6af9e..1310d6432f 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="1.2.16"/>
+    <property name="base.version" value="1.2.17"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index 50318c8a6c..adb7a37046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.17) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Wed, 25 Jun 2014 17:54:01 +0200
+
 cassandra (1.2.16) unstable; urgency=low
 
   * New release