diff --git a/CHANGES.txt b/CHANGES.txt
index 6986234606..4d06b0abd5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,7 +17,7 @@
  * Add way to force the cassandra-cli to refresh it's schema (CASSANDRA-4052)
 
 
-1.1-dev
+1.1.0-final
  * fix NPE in cql3 ALTER TABLE (CASSANDRA-4163)
  * (cqlsh) fix recognizing uppercase SELECT keyword (CASSANDRA-4161)
  * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065)
diff --git a/NOTICE.txt b/NOTICE.txt
index 0f033f1f16..da1ca026c1 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -36,3 +36,7 @@ Written by Taro L. Saito.
 Streaming compression support provided by ning-compress
 (https://github.com/ning/compress)
 Copyright 2009-2010 Ning, Inc.
+
+Alternative map implementation provided by SnapTree
+(https://github.com/nbronson/snaptree)
+Written by Nathan G. Bronson et al.
diff --git a/build.xml b/build.xml
index 89f3bc2006..b7df8d2659 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.1.0-rc1"/>
+    <property name="base.version" value="1.1.0"/>
     <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 9c795f1bf9..7381275ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.0) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 20 Apr 2012 17:51:39 +0200
+
 cassandra (1.1.0~rc1) unstable; urgency=low
 
   * New Release Candidate
diff --git a/lib/licenses/snaptree-0.1-SNAPSHOT.txt b/lib/licenses/snaptree-0.1.txt
similarity index 100%
rename from lib/licenses/snaptree-0.1-SNAPSHOT.txt
rename to lib/licenses/snaptree-0.1.txt