diff --git a/README.md b/README.md
index 80ce64cd..9f9c6d0e 100644
--- a/README.md
+++ b/README.md
@@ -581,7 +581,7 @@ See also [`opts.ca`](#opts-ca).
 ##### <a name="opts-timeout"></a> `opts.timeout`
 
 * Type: Milliseconds
-* Default: 30000 (30 seconds)
+* Default: 0 (no timeout)
 
 Time before a hanging request times out.
 
diff --git a/config.js b/config.js
index d7be3f9b..c4e8b687 100644
--- a/config.js
+++ b/config.js
@@ -76,7 +76,7 @@ module.exports = figgyPudding({
   'spec': {},
   'strict-ssl': {},
   'timeout': {
-    default: 30 * 1000
+    default: 0
   },
   'user-agent': {
     default: `${
diff --git a/test/config.js b/test/config.js
index 20292578..72bb5847 100644
--- a/test/config.js
+++ b/test/config.js
@@ -23,7 +23,7 @@ test('isFromCI config option', t => {
 
 test('default timeout', t => {
   const DEFAULT_OPTS = config({})
-  t.equal(DEFAULT_OPTS.timeout, 30 * 1000, 'default timeout is 30s')
+  t.equal(DEFAULT_OPTS.timeout, 0, 'default timeout is 0 (no timeout)')
   const SPECIFIED_OPTS = config({
     timeout: 15 * 1000
   })