diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go
index 349f79e7899a8ccbf9bc86c02073144b38efb08a..be4837503ecd6c41235540c2910ee809bdfaba52 100644
--- a/p2p/host/basic/natmgr.go
+++ b/p2p/host/basic/natmgr.go
@@ -8,6 +8,7 @@ import (
 	lgbl "github.com/libp2p/go-libp2p-loggables"
 	inat "github.com/libp2p/go-libp2p-nat"
 	inet "github.com/libp2p/go-libp2p-net"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
@@ -187,6 +188,9 @@ func addPortMapping(nmgr *natManager, intaddr ma.Multiaddr) {
 		return
 	}
 
+	// TODO: make these temporary and rediscover them.
+	nmgr.net.Peerstore().AddAddr(nmgr.net.LocalPeer(), extaddr, pstore.PermanentAddrTTL)
+
 	lm["outcome"] = "success"
 	lm["externalAddr"] = func() interface{} { return extaddr.String() }
 	log.Infof("established nat port mapping: %s <--> %s", intaddr, extaddr)