diff --git a/CHANGES.txt b/CHANGES.txt
index 02e9356c523..564dcffc0c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -186,6 +186,8 @@ Release 0.21.0 - Unreleased
                (Gary Helmling via Lars George)
    HBASE-2150  Deprecated HBC(Configuration) constructor doesn't call this()
    HBASE-2154  Fix Client#next(int) javadoc
+   HBASE-2152  Add default jmxremote.{access|password} files into conf
+               (Lars George and Gary Helmling via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index af765e96ed9..42e3d90167d 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -39,10 +39,11 @@ export HBASE_OPTS="-XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+
 # Uncomment below to enable java garbage collection logging.
 # export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log"
 
-# Uncomment and adjust/create "jmxremote.*" to enable JMX exporting
-# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false"
-# export HBASE_JMX_BASE="$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.password.file=$HBASE_HOME/conf/jmxremote.password"
-# export HBASE_JMX_BASE="$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.access.file=$HBASE_HOME/conf/jmxremote.access"
+# Uncomment and adjust to enable JMX exporting
+# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.
+# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
+#
+# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
 # export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10101"
 # export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102"
 # export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103"