diff --git a/CHANGES.txt b/CHANGES.txt
index bb78bd0bd3e..0ea826a117e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -88,6 +88,7 @@ Hbase Change Log
    HBASE-480   Tool to manually merge two regions
    HBASE-477   Add support for an HBASE_CLASSPATH
    HBASE-443   Move internal classes out of HStore
+   HBASE-515   At least double default timeouts between regionserver and master
    
 Branch 0.1
 
diff --git a/conf/hbase-default.xml b/conf/hbase-default.xml
index 5e9feaa2738..538a01dfa9a 100644
--- a/conf/hbase-default.xml
+++ b/conf/hbase-default.xml
@@ -101,7 +101,7 @@
   </property>
   <property>
     <name>hbase.master.lease.period</name>
-    <value>30000</value>
+    <value>60000</value>
     <description>HMaster server lease period in milliseconds. Default is
     30 seconds.  Region servers must report in within this period else
     they are considered dead.  On loaded cluster, may need to up this