diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
+0.6.0.1 Lars Petersen <info@lars-petersen.net> 2016-04-10
+
+ * Adapted the `AddrInfo` test suite to not depend on specific nameresolution
+   features that aren't available in a `chroot()` environment (see issue #12).
+
 0.6.0.0 Lars Petersen <info@lars-petersen.net> 2016-03-26
+
  * Improved and adapted documentation.
  * Merged `GetSocketOption` and `SetSocketOption` to one single type class
    `SocketOption`.
diff --git a/socket.cabal b/socket.cabal
--- a/socket.cabal
+++ b/socket.cabal
@@ -1,8 +1,8 @@
 name:                socket
-version:             0.6.0.0
+version:             0.6.0.1
 synopsis:            An extensible socket library.
 description:
-  This library is a minimal and cross platform interface for
+  This library is a minimal cross platform interface for
   BSD style networking.
 
 license:             MIT
diff --git a/tests/AddrInfo.hs b/tests/AddrInfo.hs
--- a/tests/AddrInfo.hs
+++ b/tests/AddrInfo.hs
@@ -7,22 +7,19 @@
 import Control.Exception
 import System.Socket
 import System.Socket.Family.Inet as Inet
-import System.Socket.Family.Inet6 as Inet6
 import System.Socket.Type.Stream
 import System.Socket.Protocol.TCP
-import System.Exit
 
 main :: IO ()
 main = do
   t0001
   t0002
-  t0003
 
 t0001 :: IO ()
 t0001 = do
   ais <- getAddressInfo
           (Just "127.0.0.1")
-          (Just "http")
+          (Just "80")
           aiNumericHost
           `onException` p 0 :: IO [AddressInfo Inet Stream TCP]
   when (length ais /= 1) (e 1)
@@ -52,6 +49,8 @@
 --   AI_V4MAPPEND and AI_ALL. Asking for localhost should
 --   yield an additional v4-mappend IPV6-Address in the second case,
 --   but not in the first one.
+{-
+-- TODO: Commented out due to issue #12 until a solution has been found.
 t0003 :: IO ()
 t0003 = do
   x <- getAddressInfo
@@ -68,3 +67,4 @@
   where
     p i = print ("t0003." ++ show i)
     e i = error ("t0003." ++ show i)
+-}