diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab0a2c354..3b18d0c89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
 Change log
 ==========
 
-1.20.0 (2018-03-07)
+1.20.1 (2018-03-21)
+-------------------
+
+### Bugfixes
+
+- Fixed an issue where `docker-compose build` would error out if the
+  build context contained directory symlinks
+
+1.20.0 (2018-03-20)
 -------------------
 
 ### New features
diff --git a/compose/__init__.py b/compose/__init__.py
index 1c5a409f1..5706c78ea 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.20.0'
+__version__ = '1.20.1'
diff --git a/script/run/run.sh b/script/run/run.sh
index a739edb35..0cc7c1463 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.20.0"
+VERSION="1.20.1"
 IMAGE="docker/compose:$VERSION"