diff --git a/dbus.cabal b/dbus.cabal
--- a/dbus.cabal
+++ b/dbus.cabal
@@ -1,6 +1,6 @@
-cabal-version: >=1.8
+cabal-version: >=1.10
 name: dbus
-version: 1.2.14
+version: 1.2.15.1
 license: Apache-2.0
 license-file: license.txt
 maintainer: Andrey Sverdlichenko <blaze@ruddy.ru>
@@ -89,6 +89,7 @@
         DBus.TH
         DBus.Transport
     hs-source-dirs: lib
+    default-language: Haskell2010
     ghc-options: -W -Wall
     build-depends:
         base ==4.*,
@@ -137,6 +138,7 @@
         DBusTests.Util
         DBusTests.Variant
         DBusTests.Wire
+    default-language: Haskell2010
     ghc-options: -W -Wall -fno-warn-orphans
     build-depends:
         dbus -any,
@@ -153,7 +155,7 @@
         QuickCheck <2.15,
         random <1.2,
         resourcet <1.3,
-        tasty <1.3,
+        tasty <1.4,
         tasty-hunit <0.11,
         tasty-quickcheck <0.11,
         text <1.3,
@@ -165,6 +167,7 @@
     type: exitcode-stdio-1.0
     main-is: DBusBenchmarks.hs
     hs-source-dirs: benchmarks
+    default-language: Haskell2010
     ghc-options: -Wall -fno-warn-orphans
     build-depends:
         dbus -any,
diff --git a/lib/DBus/Internal/Wire.hs b/lib/DBus/Internal/Wire.hs
--- a/lib/DBus/Internal/Wire.hs
+++ b/lib/DBus/Internal/Wire.hs
@@ -464,8 +464,8 @@
 unmarshalArray :: Type -> Unmarshal (Vector Value)
 unmarshalArray itemType = do
     let getOffset = do
-        (UnmarshalState _ o) <- getState
-        return o
+            (UnmarshalState _ o) <- getState
+            return o
     byteCount <- unmarshalWord32
     skipPadding (alignment itemType)
     start <- getOffset
@@ -611,10 +611,10 @@
                   -> m (Either UnmarshalError ReceivedMessage)
 unmarshalMessageM getBytes' = runErrorT $ do
     let getBytes count = do
-        bytes <- ErrorT (liftM Right (getBytes' count))
-        if Data.ByteString.length bytes < count
-            then throwErrorT (UnmarshalError "Unexpected end of input while parsing message header.")
-            else return bytes
+            bytes <- ErrorT (liftM Right (getBytes' count))
+            if Data.ByteString.length bytes < count
+                then throwErrorT (UnmarshalError "Unexpected end of input while parsing message header.")
+                else return bytes
 
     let Just fixedSig = parseSignature "yyyyuuu"
     fixedBytes <- getBytes 16
diff --git a/lib/DBus/Socket.hs b/lib/DBus/Socket.hs
--- a/lib/DBus/Socket.hs
+++ b/lib/DBus/Socket.hs
@@ -347,20 +347,20 @@
 serverAuthExternal :: SocketTransport -> UUID -> IO Bool
 serverAuthExternal t uuid = do
     let waitForBegin = do
-        resp <- transportGetLine t
-        if resp == "BEGIN"
-            then return ()
-            else waitForBegin
+            resp <- transportGetLine t
+            if resp == "BEGIN"
+                then return ()
+                else waitForBegin
 
     let checkToken token = do
-        (_, uid, _) <- socketTransportCredentials t
-        let wantToken = concatMap (printf "%02X" . ord) (maybe "XXX" show uid)
-        if token == wantToken
-            then do
-                transportPutLine t ("OK " ++ formatUUID uuid)
-                waitForBegin
-                return True
-            else return False
+            (_, uid, _) <- socketTransportCredentials t
+            let wantToken = concatMap (printf "%02X" . ord) (maybe "XXX" show uid)
+            if token == wantToken
+                then do
+                    transportPutLine t ("OK " ++ formatUUID uuid)
+                    waitForBegin
+                    return True
+                else return False
 
     c <- transportGet t 1
     if c /= Char8.pack "\x00"
diff --git a/tests/DBusTests/Introspection.hs b/tests/DBusTests/Introspection.hs
--- a/tests/DBusTests/Introspection.hs
+++ b/tests/DBusTests/Introspection.hs
@@ -129,10 +129,10 @@
 subObject :: ObjectPath -> Gen I.Object
 subObject parentPath = sized $ \n -> resize (min n 4) $ do
     let nonRoot = do
-        x <- resize 10 arbitrary
-        case formatObjectPath x of
-            "/" -> nonRoot
-            x'  -> return x'
+            x <- resize 10 arbitrary
+            case formatObjectPath x of
+                "/" -> nonRoot
+                x'  -> return x'
 
     thisPath <- nonRoot
     let path' = case formatObjectPath parentPath of
diff --git a/tests/DBusTests/Socket.hs b/tests/DBusTests/Socket.hs
--- a/tests/DBusTests/Socket.hs
+++ b/tests/DBusTests/Socket.hs
@@ -91,32 +91,32 @@
         openedVar <- forkVar (open addr)
 
         bracket (takeMVar acceptedVar) close $ \sock1 -> do
-        bracket (takeMVar openedVar) close $ \sock2 -> do
-            -- client -> server
-            do
-                serialVar <- newEmptyMVar
-                sentVar <- forkVar (send sock2 msg (putMVar serialVar))
-                receivedVar <- forkVar (receive sock1)
+            bracket (takeMVar openedVar) close $ \sock2 -> do
+                -- client -> server
+                do
+                    serialVar <- newEmptyMVar
+                    sentVar <- forkVar (send sock2 msg (putMVar serialVar))
+                    receivedVar <- forkVar (receive sock1)
 
-                serial <- takeMVar serialVar
-                sent <- takeMVar sentVar
-                received <- takeMVar receivedVar
+                    serial <- takeMVar serialVar
+                    sent <- takeMVar sentVar
+                    received <- takeMVar receivedVar
 
-                sent @?= ()
-                received @?= ReceivedMethodCall serial msg
+                    sent @?= ()
+                    received @?= ReceivedMethodCall serial msg
 
-            -- server -> client
-            do
-                serialVar <- newEmptyMVar
-                sentVar <- forkVar (send sock1 msg (putMVar serialVar))
-                receivedVar <- forkVar (receive sock2)
+                -- server -> client
+                do
+                    serialVar <- newEmptyMVar
+                    sentVar <- forkVar (send sock1 msg (putMVar serialVar))
+                    receivedVar <- forkVar (receive sock2)
 
-                serial <- takeMVar serialVar
-                sent <- takeMVar sentVar
-                received <- takeMVar receivedVar
+                    serial <- takeMVar serialVar
+                    sent <- takeMVar sentVar
+                    received <- takeMVar receivedVar
 
-                sent @?= ()
-                received @?= ReceivedMethodCall serial msg
+                    sent @?= ()
+                    received @?= ReceivedMethodCall serial msg
 
 dummyAuth :: Transport t => Authenticator t
 dummyAuth = authenticator