diff --git a/src/java/org/apache/hadoop/hbase/master/HMaster.java b/src/java/org/apache/hadoop/hbase/master/HMaster.java
index ebddd33fd91..a4ecc03d259 100644
--- a/src/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -214,8 +214,8 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
 
     this.numRetries =  conf.getInt("hbase.client.retries.number", 2);
     this.maxRegionOpenTime =
-      conf.getLong("hbase.hbasemaster.maxregionopen", 60 * 1000);
-    this.leaseTimeout = conf.getInt("hbase.master.lease.period", 30 * 1000);
+      conf.getLong("hbase.hbasemaster.maxregionopen", 120 * 1000);
+    this.leaseTimeout = conf.getInt("hbase.master.lease.period", 120 * 1000);
     
     this.server = HbaseRPC.getServer(this, address.getBindAddress(),
         address.getPort(), conf.getInt("hbase.regionserver.handler.count", 10),
diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index aae18333526..94ffeae3844 100644
--- a/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -234,7 +234,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
     this.threadWakeFrequency = conf.getInt(THREAD_WAKE_FREQUENCY, 10 * 1000);
     this.msgInterval = conf.getInt("hbase.regionserver.msginterval", 3 * 1000);
     this.serverLeaseTimeout =
-      conf.getInt("hbase.master.lease.period", 30 * 1000);
+      conf.getInt("hbase.master.lease.period", 120 * 1000);
 
     // Cache flushing thread.
     this.cacheFlusher = new Flusher(conf, this);