diff --git a/daemon/daemon.go b/daemon/daemon.go
index 8ec84d848..3ea4cc5da 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -63,7 +63,12 @@ func NewDaemonListener(ipfsnode *core.IpfsNode, addr *ma.Multiaddr, confdir stri
 		return nil, err
 	}
 
-	_, err = ofi.Write([]byte(host))
+	mstr, err := addr.String()
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = ofi.Write([]byte(mstr))
 	if err != nil {
 		log.Warning("Could not write to rpcaddress file: %s", err)
 		return nil, err
diff --git a/daemon/daemon_client.go b/daemon/daemon_client.go
index fe5b1f9ef..17d1b2c26 100644
--- a/daemon/daemon_client.go
+++ b/daemon/daemon_client.go
@@ -67,6 +67,7 @@ func SendCommand(command *Command, confdir string) error {
 		return err
 	}
 
+	log.Info("Daemon address: %s", server)
 	maddr, err := ma.NewMultiaddr(server)
 	if err != nil {
 		return err