diff --git a/CHANGES.txt b/CHANGES.txt
index 2a5ffd30daa..e2510915cc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -203,6 +203,7 @@ Release 0.20.0 - Unreleased
    HBASE-1488  After 1304 goes in, fix and reenable test of thrift, mr indexer,
                and merge tool
    HBASE-1531  Change new Get to use new filter API
+   HBASE-1549  in zookeeper.sh, use localhost instead of 127.0.0.1
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
diff --git a/bin/zookeeper.sh b/bin/zookeeper.sh
index 583f2bdef28..a379fb0b268 100755
--- a/bin/zookeeper.sh
+++ b/bin/zookeeper.sh
@@ -53,7 +53,7 @@ if [ "$HBASE_MANAGES_ZK" = "" ]; then
 fi
 
 if [ "$HBASE_MANAGES_ZK" = "true" ]; then
- ssh $HBASE_SSH_OPTS 127.0.0.1 $"${@// /\\ }" 2>&1 | sed "s/^/localhost: /" &
+ ssh $HBASE_SSH_OPTS localhost $"${@// /\\ }" 2>&1 | sed "s/^/localhost: /" &
  if [ "$HBASE_SLAVE_SLEEP" != "" ]; then
    sleep $HBASE_SLAVE_SLEEP
  fi