diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108a0eabbd91650676615e94fed68baf9291c879..7a2be0369d47e63ad7ae0bc8ff91a48e69b13173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Python Buildpack Changelog
 
+#141 (2018-10-10)
+
+Pin pipenv to version 2018.7.1
+Use same pip version is used for pip and pipenv installs
+Allow pipenv version override
+
 # 140 (2018-10-09)
 
 Add support for detecting SLUGIFY_USES_TEXT_UNIDECODE, which is required to
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 5e88c77134fb73fa2fbc5b94d9c153b26cc325ab..b1121711eb9d8f76f79d3fe146aa722af29846e4 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -41,6 +41,15 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
             mcount "buildvar.PIP_EXTRA_INDEX_URL"
         fi
 
+        # PIP_EXTRA_INDEX_URL allows for an alternate pypi URL to be used.
+        if [[ -r $ENV_DIR/DEFAULT_PIPENV_VERSION ]]; then
+            DEFAULT_PIPENV_VERSION="$(cat "$ENV_DIR/DEFAULT_PIPENV_VERSION")"
+            export DEFAULT_PIPENV_VERSION
+            mcount "buildvar.DEFAULT_PIPENV_VERSION"
+        else
+            export DEFAULT_PIPENV_VERSION="2018.7.1"
+        fi
+
         # Set SLUGIFY_USES_TEXT_UNIDECODE, required for Airflow versions >=1.10
         if [[ -r $ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE ]]; then
             SLUGIFY_USES_TEXT_UNIDECODE="$(cat "$ENV_DIR/SLUGIFY_USES_TEXT_UNIDECODE")"
@@ -48,7 +57,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
             mcount "buildvar.SLUGIFY_USES_TEXT_UNIDECODE"
         fi
 
-        export DEFAULT_PIPENV_VERSION="2018.7.1"
+
 
         # Install pipenv; do not upgrade.
         /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION &> /dev/null