diff --git a/CHANGELOG b/CHANGELOG
index 3c45f68307..6f7f9afac6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ git-annex (7.20190730) upstream; urgency=medium
     parsing.
   * Drop support for building with ghc older than 8.4.4,
     and with older versions of serveral haskell libraries.
+  * Support building with socks-0.6 and persistant-template-2.7.
   * Corrected some license statements.
     Thanks, Sean Whitton.
 
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index 4180c58541..f9cb0d1cd1 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-}
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Database.ContentIdentifier (
 	ContentIdentifierHandle,
diff --git a/Database/Export.hs b/Database/Export.hs
index 3d8b7f993a..0da0173fad 100644
--- a/Database/Export.hs
+++ b/Database/Export.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Database.Export (
 	ExportHandle,
diff --git a/Database/Fsck.hs b/Database/Fsck.hs
index affac558bb..c0c40151ca 100644
--- a/Database/Fsck.hs
+++ b/Database/Fsck.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Database.Fsck (
 	FsckHandle,
diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
index 6dd870afcb..2314a8dae4 100644
--- a/Database/Keys/SQL.hs
+++ b/Database/Keys/SQL.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Database.Keys.SQL where
 
diff --git a/Utility/Tor.hs b/Utility/Tor.hs
index 427fb100bc..094c91aacd 100644
--- a/Utility/Tor.hs
+++ b/Utility/Tor.hs
@@ -5,6 +5,8 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE CPP #-}
+
 module Utility.Tor where
 
 import Common
@@ -37,7 +39,12 @@ connectHiddenService (OnionAddress address) port = do
 	return s
   where
 	torsocksport = 9050
+#if MIN_VERSION_socks(0,6,0)
+	torsockconf = defaultSocksConf $ SockAddrInet torsocksport $
+		tupleToHostAddress (127,0,0,1)
+#else
 	torsockconf = defaultSocksConf "127.0.0.1" torsocksport
+#endif
 	socksdomain = SocksAddrDomainName (BU8.fromString address)
 	socksaddr = SocksAddress socksdomain (fromIntegral port)
 
diff --git a/doc/todo/Compatibility_with_socks-0.6_and_persistant-template-2.7.mdwn b/doc/todo/Compatibility_with_socks-0.6_and_persistant-template-2.7.mdwn
index 8c71e58874..b8b35cefd8 100644
--- a/doc/todo/Compatibility_with_socks-0.6_and_persistant-template-2.7.mdwn
+++ b/doc/todo/Compatibility_with_socks-0.6_and_persistant-template-2.7.mdwn
@@ -3,3 +3,5 @@ The current Hackage version (7.20190615) only compiles with the constraints sock
 The compiler errors can be fixed with the attached patches.
 
 In the case of the socks changes (for Tor), I am not sure if it will actually work correctly.
+
+> Found the necessary changes to get it to compile. [[done]] --[[Joey]]