diff --git a/main.go b/main.go
index 4f9b2e376..4f3b96f0a 100644
--- a/main.go
+++ b/main.go
@@ -80,6 +80,7 @@ func (n *Node) Stop() {
 func (n *Node) AddListener(l p2p.Listener) {
 	log.Info("Added %v", l)
 	n.lz = append(n.lz, l)
+	n.book.AddOurAddress(l.ExternalAddress())
 }
 
 func (n *Node) inboundConnectionHandler(l p2p.Listener) {
diff --git a/p2p/addrbook.go b/p2p/addrbook.go
index 9122d939c..70eab54ed 100644
--- a/p2p/addrbook.go
+++ b/p2p/addrbook.go
@@ -19,29 +19,6 @@ import (
 	. "github.com/tendermint/tendermint/common"
 )
 
-/* AddrBook - concurrency safe peer address manager */
-type AddrBook struct {
-	filePath string
-
-	mtx        sync.Mutex
-	rand       *rand.Rand
-	key        string
-	addrLookup map[string]*knownAddress // new & old
-	addrNew    []map[string]*knownAddress
-	addrOld    []map[string]*knownAddress
-	started    uint32
-	stopped    uint32
-	wg         sync.WaitGroup
-	quit       chan struct{}
-	nOld       int
-	nNew       int
-}
-
-const (
-	bucketTypeNew = 0x01
-	bucketTypeOld = 0x02
-)
-
 const (
 	// addresses under which the address manager will claim to need more addresses.
 	needAddressThreshold = 1000
@@ -96,12 +73,38 @@ const (
 	serializationVersion = 1
 )
 
+/* AddrBook - concurrency safe peer address manager */
+type AddrBook struct {
+	filePath string
+
+	mtx        sync.Mutex
+	rand       *rand.Rand
+	key        string
+	ourAddrs   map[string]struct{}
+	addrLookup map[string]*knownAddress // new & old
+	addrNew    []map[string]*knownAddress
+	addrOld    []map[string]*knownAddress
+	started    uint32
+	stopped    uint32
+	wg         sync.WaitGroup
+	quit       chan struct{}
+	nOld       int
+	nNew       int
+}
+
+const (
+	bucketTypeNew = 0x01
+	bucketTypeOld = 0x02
+)
+
 // Use Start to begin processing asynchronous address updates.
 func NewAddrBook(filePath string) *AddrBook {
 	am := AddrBook{
-		rand:     rand.New(rand.NewSource(time.Now().UnixNano())),
-		quit:     make(chan struct{}),
-		filePath: filePath,
+		rand:       rand.New(rand.NewSource(time.Now().UnixNano())),
+		ourAddrs:   make(map[string]struct{}),
+		addrLookup: make(map[string]*knownAddress),
+		quit:       make(chan struct{}),
+		filePath:   filePath,
 	}
 	am.init()
 	return &am
@@ -110,8 +113,6 @@ func NewAddrBook(filePath string) *AddrBook {
 // When modifying this, don't forget to update loadFromFile()
 func (a *AddrBook) init() {
 	a.key = RandHex(24) // 24/2 * 8 = 96 bits
-	// addr -> ka index
-	a.addrLookup = make(map[string]*knownAddress)
 	// New addr buckets
 	a.addrNew = make([]map[string]*knownAddress, newBucketCount)
 	for i := range a.addrNew {
@@ -141,6 +142,12 @@ func (a *AddrBook) Stop() {
 	}
 }
 
+func (a *AddrBook) AddOurAddress(addr *NetAddress) {
+	a.mtx.Lock()
+	defer a.mtx.Unlock()
+	a.ourAddrs[addr.String()] = struct{}{}
+}
+
 func (a *AddrBook) AddAddress(addr *NetAddress, src *NetAddress) {
 	a.mtx.Lock()
 	defer a.mtx.Unlock()
@@ -267,10 +274,9 @@ func (a *AddrBook) GetSelection() []*NetAddress {
 		i++
 	}
 
-
 	numAddresses := MaxInt(
 		MinInt(minGetSelection, len(allAddr)),
-		len(allAddr) * getSelectionPercent / 100)
+		len(allAddr)*getSelectionPercent/100)
 	numAddresses = MinInt(maxGetSelection, numAddresses)
 
 	// Fisher-Yates shuffle the array. We only need to do the first
@@ -505,6 +511,10 @@ func (a *AddrBook) addAddress(addr, src *NetAddress) {
 		log.Warning("Cannot add non-routable address %v", addr)
 		return
 	}
+	if _, ok := a.ourAddrs[addr.String()]; ok {
+		// Ignore our own listener address.
+		return
+	}
 
 	ka := a.addrLookup[addr.String()]