diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto
index f4974e5cd..95abc1b94 100755
--- a/letsencrypt-auto-source/letsencrypt-auto
+++ b/letsencrypt-auto-source/letsencrypt-auto
@@ -24,6 +24,7 @@ if [ -z "$XDG_DATA_HOME" ]; then
   XDG_DATA_HOME=~/.local/share
 fi
 if [ -z "$VENV_PATH" ]; then
+  OLD_VENV_PATH="$XDG_DATA_HOME/letsencrypt"
   VENV_PATH="/opt/eff.org/certbot/venv"
 fi
 VENV_BIN="$VENV_PATH/bin"
@@ -1106,6 +1107,11 @@ UNLIKELY_EOF
       rm -rf "$VENV_PATH"
       exit 1
     fi
+
+    if [ -d $OLD_VENV_PATH -a ! -L $OLD_VENV_PATH ]; then
+      ln -s $VENV_PATH $OLD_VENV_PATH
+    fi
+
     say "Installation succeeded."
   fi
   "$VENV_BIN/letsencrypt" "$@"
diff --git a/letsencrypt-auto-source/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template
index a3e855599..288bbec42 100755
--- a/letsencrypt-auto-source/letsencrypt-auto.template
+++ b/letsencrypt-auto-source/letsencrypt-auto.template
@@ -24,6 +24,7 @@ if [ -z "$XDG_DATA_HOME" ]; then
   XDG_DATA_HOME=~/.local/share
 fi
 if [ -z "$VENV_PATH" ]; then
+  OLD_VENV_PATH="$XDG_DATA_HOME/letsencrypt"
   VENV_PATH="/opt/eff.org/certbot/venv"
 fi
 VENV_BIN="$VENV_PATH/bin"
@@ -391,6 +392,11 @@ UNLIKELY_EOF
       rm -rf "$VENV_PATH"
       exit 1
     fi
+
+    if [ -d $OLD_VENV_PATH -a ! -L $OLD_VENV_PATH ]; then
+      ln -s $VENV_PATH $OLD_VENV_PATH
+    fi
+
     say "Installation succeeded."
   fi
   "$VENV_BIN/letsencrypt" "$@"