diff --git a/README b/README
index 58a61c504..f3516faf8 100644
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/mitmproxy/netlib.png)](https://travis-ci.org/mitmproxy/netlib) [![Coverage Status](https://coveralls.io/repos/mitmproxy/netlib/badge.png)](https://coveralls.io/r/mitmproxy/netlib)
 
 Netlib is a collection of network utility classes, used by the pathod and
 mitmproxy projects. It differs from other projects in some fundamental
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 5a07c013a..33f7ef3a1 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -176,12 +176,13 @@ class Reader(_FileLike):
 class TCPClient:
     rbufsize = -1
     wbufsize = -1
-    def __init__(self, host, port, source_address=None):
+    def __init__(self, host, port, source_address=None, use_ipv6=False):
         self.host, self.port = host, port
+        self.source_address = source_address
+        self.use_ipv6 = use_ipv6
         self.connection, self.rfile, self.wfile = None, None, None
         self.cert = None
         self.ssl_established = False
-        self.source_address = source_address
 
     def convert_to_ssl(self, cert=None, sni=None, method=TLSv1_METHOD, options=None):
         """
@@ -211,11 +212,10 @@ class TCPClient:
 
     def connect(self):
         try:
-            addr = socket.gethostbyname(self.host)
-            connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            connection = socket.socket(socket.AF_INET6 if self.use_ipv6 else socket.AF_INET, socket.SOCK_STREAM)
             if self.source_address:
                 connection.bind(self.source_address)
-            connection.connect((addr, self.port))
+            connection.connect((self.host, self.port))
             self.rfile = Reader(connection.makefile('rb', self.rbufsize))
             self.wfile = Writer(connection.makefile('wb', self.wbufsize))
         except (socket.error, IOError), err:
@@ -359,11 +359,12 @@ class BaseHandler:
 
 class TCPServer:
     request_queue_size = 20
-    def __init__(self, server_address):
+    def __init__(self, server_address, use_ipv6=False):
         self.server_address = server_address
+        self.use_ipv6 = use_ipv6
         self.__is_shut_down = threading.Event()
         self.__shutdown_request = False
-        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket = socket.socket(socket.AF_INET6 if self.use_ipv6 else socket.AF_INET, socket.SOCK_STREAM)
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.bind(self.server_address)
         self.server_address = self.socket.getsockname()
diff --git a/netlib/test.py b/netlib/test.py
index e7d4c2337..cd1a38471 100644
--- a/netlib/test.py
+++ b/netlib/test.py
@@ -16,6 +16,9 @@ class ServerThread(threading.Thread):
 class ServerTestBase:
     ssl = None
     handler = None
+    addr = ("localhost", 0)
+    use_ipv6 = False
+    
     @classmethod
     def setupAll(cls):
         cls.q = Queue.Queue()
@@ -26,7 +29,7 @@ class ServerTestBase:
 
     @classmethod
     def makeserver(cls):
-        return TServer(cls.ssl, cls.q, cls.handler)
+        return TServer(cls.ssl, cls.q, cls.handler, cls.addr, cls.use_ipv6)
 
     @classmethod
     def teardownAll(cls):
@@ -38,11 +41,11 @@ class ServerTestBase:
 
 
 class TServer(tcp.TCPServer):
-    def __init__(self, ssl, q, handler_klass, addr=("127.0.0.1", 0)):
+    def __init__(self, ssl, q, handler_klass, addr, use_ipv6):
         """
             ssl: A {cert, key, v3_only} dict.
         """
-        tcp.TCPServer.__init__(self, addr)
+        tcp.TCPServer.__init__(self, addr, use_ipv6=use_ipv6)
         self.ssl, self.q = ssl, q
         self.handler_klass = handler_klass
         self.last_handler = None
diff --git a/test/test_tcp.py b/test/test_tcp.py
index 220ece15a..75dcad13c 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -74,6 +74,18 @@ class TestServer(test.ServerTestBase):
         assert c.rfile.readline() == testval
 
 
+class TestServerIPv6(test.ServerTestBase):
+    handler = EchoHandler
+    use_ipv6 = True
+
+    def test_echo(self):
+        testval = "echo!\n"
+        c = tcp.TCPClient("::1", self.port, use_ipv6=True)
+        c.connect()
+        c.wfile.write(testval)
+        c.wfile.flush()
+        assert c.rfile.readline() == testval
+
 
 class FinishFailHandler(tcp.BaseHandler):
     def handle(self):