diff --git a/.rat-excludes b/.rat-excludes
index f41d97a08d..a030f84d7b 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -27,6 +27,7 @@ conf/schema-sample.txt
 drivers/txpy/txcql/cassandra/*
 drivers/py/cql/cassandra/*
 doc/cql/CQL*
+doc/cql3/CQL*
 build.properties.default
 test/data/legacy-sstables/**
 examples/pig/**
diff --git a/CHANGES.txt b/CHANGES.txt
index d32d12b26f..d50bc4b132 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,10 @@
  * (cql3) Fix deletion bug (CASSANDRA-4193)
  * Fix computation of overlapping sstable for leveled compaction (CASSANDRA-4321)
  * Improve scrub and allow to run it offline (CASSANDRA-4321)
+ * Fix assertionError in StorageService.bulkLoad (CASSANDRA-4368)
+ * (cqlsh) add option to authenticate to a keyspace at startup (CASSANDRA-4108)
+ * (cqlsh) fix ASSUME functionality (CASSANDRA-4352)
+ * Fix ColumnFamilyRecordReader to not return progress > 100% (CASSANDRA-3942)
 Merged from 1.0:
  * Set gc_grace on index CF to 0 (CASSANDRA-4314)
 
diff --git a/NEWS.txt b/NEWS.txt
index 23814b1efc..ca16ed2ef6 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -42,6 +42,19 @@ Features
       on timeouts for different operation types
 
 
+1.1.2
+=====
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 1.1 if you are upgrading
+      from a previous version.
+
+Features
+--------
+    - cqlsh has a new COPY command to load data from CSV flat files
+
+
 1.1.1
 =====
 
diff --git a/debian/changelog b/debian/changelog
index 0d6a31abbd..4b97f75c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.2) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 29 Jun 2012 16:56:29 +0200
+
 cassandra (1.1.1) unstable; urgency=low
 
   * New release
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db
new file mode 100644
index 0000000000..45300342a7
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db
new file mode 100644
index 0000000000..1b5e70883c
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db
new file mode 100644
index 0000000000..2cbe31921e
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db
new file mode 100644
index 0000000000..7231157387
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db differ