diff --git a/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py
index 757c76fda..8e3a47ae8 100644
--- a/mitmproxy/console/flowdetailview.py
+++ b/mitmproxy/console/flowdetailview.py
@@ -23,6 +23,7 @@ def flowdetails(state, flow):
         text.append(urwid.Text([("head", "Server Connection:")]))
         parts = [
             ["Address", repr(sc.address)],
+            ["Peer Address", repr(sc.peer_address)],
         ]
 
         text.extend(
diff --git a/mitmproxy/flow_format_compat.py b/mitmproxy/flow_format_compat.py
index a7a95af3a..4c3aa7270 100644
--- a/mitmproxy/flow_format_compat.py
+++ b/mitmproxy/flow_format_compat.py
@@ -35,6 +35,7 @@ def convert_015_016(data):
 
 
 def convert_016_017(data):
+    data["server_conn"]["peer_address"] = None
     data["version"] = (0, 17)
     return data
 
diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py
index 857580b8e..2ffc667d2 100644
--- a/mitmproxy/models/connections.py
+++ b/mitmproxy/models/connections.py
@@ -120,6 +120,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
         timestamp_tcp_setup=float,
         timestamp_ssl_setup=float,
         address=tcp.Address,
+        peer_address=tcp.Address,
         source_address=tcp.Address,
         cert=certutils.SSLCert,
         ssl_established=bool,
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 6423888a1..574f38458 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -458,9 +458,11 @@ class _Connection(object):
     def __init__(self, connection):
         if connection:
             self.connection = connection
+            self.peer_address = Address(connection.getpeername())
             self._makefile()
         else:
             self.connection = None
+            self.peer_address = None
             self.rfile = None
             self.wfile = None
 
@@ -701,6 +703,7 @@ class TCPClient(_Connection):
                 'Error connecting to "%s": %s' %
                 (self.address.host, err))
         self.connection = connection
+        self.peer_address = Address(connection.getpeername())
         self._makefile()
 
     def settimeout(self, n):
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index edcdf3e21..0d65df717 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -93,6 +93,7 @@ def tserver_conn():
     c = ServerConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
         source_address=dict(address=("address", 22), use_ipv6=True),
+        peer_address=None,
         cert=None,
         timestamp_start=1,
         timestamp_tcp_setup=2,