diff --git a/CHANGES.txt b/CHANGES.txt
index ff3023cf85b..80f405410bc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -58,6 +58,8 @@ Release 0.91.0 - Unreleased
    HBASE-3593  DemoClient.cpp is outdated
    HBASE-3601  TestMasterFailover broken in TRUNK
    HBASE-3605  Fix balancer log message
+   HBASE-3603  Remove -XX:+HeapDumpOnOutOfMemoryError autodump of heap option
+               on OOME
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index 807bbe923db..bf0910ba957 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -34,7 +34,7 @@
 # Below are what we set by default.  May only work with SUN JVM.
 # For more on why as well as other possible settings,
 # see http://wiki.apache.org/hadoop/PerformanceTuning
-export HBASE_OPTS="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
+export HBASE_OPTS="-ea -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 
 # Uncomment below to enable java garbage collection logging.
 # export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log"