diff --git a/CHANGES.txt b/CHANGES.txt
index 9d46d2730be..a7d4b52ef63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -152,6 +152,7 @@ Release 0.21.0 - Unreleased
                (Lars George and Gary Helmling via Stack)
    HBASE-2093  [stargate] RowSpec parse bug
    HBASE-2100  [EC2] Adjust fs.file-max
+   HBASE-2114  Can't start HBase in trunk (JD and Kay Kay via JD)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/ivy.xml b/ivy.xml
index 4a1a9bc66a9..f5b89ba8135 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -91,7 +91,11 @@
       <exclude conf="test"/>  
    </dependency>            
    <dependency org="org.apache.lucene" name="lucene-core"
-               rev="${lucene.version}" conf="common->default" />               
+               rev="${lucene.version}" conf="common->default" />      
+   <dependency org="log4j" name="log4j" 
+               rev="${log4j.version}" conf="common->master">
+      <exclude conf="jmx,mail,jms"/>  
+   </dependency>                        
    <!--
    TODO: Enter URL in ivysettings.xml that stores the artifacts of Zookeeper / thrift.     
 
@@ -110,9 +114,6 @@
                rev="${hadoop-mapred.version}" conf="test->default" transitive="false"/> 
    <dependency org="org.apache.commons" name="commons-math" 
                rev="${commons-math.version}" conf="test->default"/> 
-   <dependency org="log4j" name="log4j" 
-               rev="${log4j.version}" conf="test->master">
-      <exclude conf="jmx,mail,jms"/>  
-    </dependency>
+
     </dependencies>
 </ivy-module>
diff --git a/src/java/org/apache/hadoop/hbase/master/HMaster.java b/src/java/org/apache/hadoop/hbase/master/HMaster.java
index 0ca14feb378..2a11e5ac68c 100644
--- a/src/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1199,7 +1199,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
             (new LocalHBaseCluster(conf)).startup();
           } else {
             Constructor<? extends HMaster> c =
-              clazz.getConstructor(HBaseConfiguration.class);
+              clazz.getConstructor(Configuration.class);
             HMaster master = c.newInstance(conf);
             if (master.shutdownRequested.get()) {
               LOG.info("Won't bring the Master up as a shutdown is requested");
diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index cd31af0a60e..4f605ab33c5 100644
--- a/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -2323,7 +2323,7 @@ public class HRegionServer implements HConstants, HRegionInterface,
               LOG.info("vmInputArguments=" + runtime.getInputArguments());
             }
             Constructor<? extends HRegionServer> c =
-              regionServerClass.getConstructor(HBaseConfiguration.class);
+              regionServerClass.getConstructor(Configuration.class);
             HRegionServer hrs = c.newInstance(conf);
             Thread t = new Thread(hrs);
             t.setName("regionserver" + hrs.server.getListenerAddress());