diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 0000000000..7679f80ab1
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,10 @@
+version: 2
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  version: 3.5
+  install:
+    - requirements: docs-requirements.txt
+    - requirements: requirements.txt
diff --git a/docker/credentials/store.py b/docker/credentials/store.py
index 3f51e4a7eb..0017888978 100644
--- a/docker/credentials/store.py
+++ b/docker/credentials/store.py
@@ -1,5 +1,5 @@
+import errno
 import json
-import os
 import subprocess
 
 import six
@@ -84,7 +84,7 @@ def _execute(self, subcmd, data_input):
                     [self.exe, subcmd], stdin=subprocess.PIPE,
                     stdout=subprocess.PIPE, env=env,
                 )
-                output, err = process.communicate(data_input)
+                output, _ = process.communicate(data_input)
                 if process.returncode != 0:
                     raise subprocess.CalledProcessError(
                         returncode=process.returncode, cmd='', output=output
@@ -92,7 +92,7 @@ def _execute(self, subcmd, data_input):
         except subprocess.CalledProcessError as e:
             raise errors.process_store_error(e, self.program)
         except OSError as e:
-            if e.errno == os.errno.ENOENT:
+            if e.errno == errno.ENOENT:
                 raise errors.StoreError(
                     '{} not installed or not available in PATH'.format(
                         self.program
diff --git a/docker/version.py b/docker/version.py
index 68d64c8aa8..247312639f 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "4.0.0"
+version = "4.0.1"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change-log.md b/docs/change-log.md
index 53e9f207ba..4032249b97 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,6 +1,20 @@
 Change log
 ==========
 
+4.0.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/60?closed=1)
+
+### Bugfixes
+
+- Fixed an obsolete import in the `credentials` subpackage that caused import errors in
+  Python 3.7
+
+### Miscellaneous
+
+- Docs building has been repaired
+
 4.0.0
 -----
 
diff --git a/docs/user_guides/swarm_services.md b/docs/user_guides/swarm_services.md
index 369fbed00e..5c3a80d2d4 100644
--- a/docs/user_guides/swarm_services.md
+++ b/docs/user_guides/swarm_services.md
@@ -6,7 +6,7 @@
 
 Starting with Engine version 1.12 (API 1.24), it is possible to manage services
 using the Docker Engine API. Note that the engine needs to be part of a
-[Swarm cluster](../swarm.rst) before you can use the service-related methods.
+[Swarm cluster](../swarm.html) before you can use the service-related methods.
 
 ## Creating a service
 
@@ -66,4 +66,4 @@ Either the service name or service ID can be used as argument.
 
 ```python
 client.remove_service('my_service_name')
-```
\ No newline at end of file
+```