diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4939ec..a243274 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 # Master
 
+- Bugfix: Fix support for naive latest version declaration in Python 3.8
+
 --------------------------------------------------------------------------------
 
 # 169 (2020-04-22)
diff --git a/bin/steps/pipenv-python-version b/bin/steps/pipenv-python-version
index dcdf3c2..cf92cdf 100755
--- a/bin/steps/pipenv-python-version
+++ b/bin/steps/pipenv-python-version
@@ -27,6 +27,9 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then
                 if [ "$PYTHON" = 3.7 ]; then
                     echo "$LATEST_37" > "$BUILD_DIR/runtime.txt"
                 fi
+                if [ "$PYTHON" = 3.8 ]; then
+                    echo "$LATEST_38" > "$BUILD_DIR/runtime.txt"
+                fi
             fi