diff --git a/core/src/main/scala/sbt/librarymanagement/Http.scala b/core/src/main/scala/sbt/librarymanagement/Http.scala
index 833a9edc0..2b54f8140 100644
--- a/core/src/main/scala/sbt/librarymanagement/Http.scala
+++ b/core/src/main/scala/sbt/librarymanagement/Http.scala
@@ -1,7 +1,8 @@
 package sbt.librarymanagement
 
 import gigahorse._, support.okhttp.Gigahorse
+import scala.concurrent.duration.DurationInt
 
 object Http {
-  lazy val http: HttpClient = Gigahorse.http(gigahorse.Config())
+  lazy val http: HttpClient = Gigahorse.http(gigahorse.Config().withReadTimeout(60.minutes))
 }
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala
index 4c80cd152..38f520867 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala
@@ -198,8 +198,8 @@ class GigahorseUrlHandler extends AbstractURLHandler {
 
 object GigahorseUrlHandler {
   import gigahorse.HttpClient
-  import gigahorse.support.okhttp.Gigahorse
   import okhttp3.{ OkHttpClient, JavaNetAuthenticator }
+  import sbt.librarymanagement.Http
 
   // This is requires to access the constructor of URLInfo.
   private[sbt] class SbtUrlInfo(available: Boolean,
@@ -214,7 +214,7 @@ object GigahorseUrlHandler {
 
   private val EmptyBuffer: Array[Byte] = new Array[Byte](0)
 
-  lazy val http: HttpClient = Gigahorse.http(gigahorse.Config())
+  lazy val http: HttpClient = Http.http
 
   private lazy val okHttpClient: OkHttpClient = {
     http