diff --git a/CHANGES.txt b/CHANGES.txt
index 1279b0d6679..bc82be87f99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -200,6 +200,8 @@ Release 0.21.0 - Unreleased
                a long time (Cristian Ivascu via Stack)
    HBASE-2193  Better readability of - hbase.regionserver.lease.period
                (Kay Kay via Stack)
+   HBASE-2199  hbase.client.tableindexed.IndexSpecification, lines 72-73
+               should be reversed (Adrian Popescu via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
@@ -366,6 +368,8 @@ Release 0.21.0 - Unreleased
                11 attempts".
    HBASE-2220  Add a binary comparator that only compares up to the length
                of the supplied byte array (Bruno Dumon via Stack)
+   HBASE-2211  Add a new Filter that checks a single column value but does not
+               emit it. (Ferdy via Stack)
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java b/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
index b1c0a8738a7..6b4a28dc8ec 100644
--- a/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
+++ b/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
@@ -79,9 +79,9 @@ public class IndexSpecification implements Writable {
     this.indexId = indexId;
     this.indexedColumns = indexedColumns;
     this.keyGenerator = keyGenerator;
-    this.makeAllColumns();
     this.additionalColumns = (additionalColumns == null)? new byte[0][0] :
                                                           additionalColumns;
+    this.makeAllColumns();
   }
 
   public IndexSpecification() {