diff --git a/upgrade_roundcube.sh b/upgrade_roundcube.sh
index f880d14..56453fc 100755
--- a/upgrade_roundcube.sh
+++ b/upgrade_roundcube.sh
@@ -296,6 +296,12 @@ DEFAULT_WEBSITE_BASEDIR="/var/www/${WEBSITE_NAME}"
 [[ -n "$WEBSITE_BASEDIR" ]] || WEBSITE_BASEDIR=$DEFAULT_WEBSITE_BASEDIR
 CUR_INSTALL_DIR="$(realpath "${WEBSITE_BASEDIR}/htdocs")"
 
+# For Roundcube 1.7.x the symlink points to roundcubemail-x.y.z/public_html/
+# We need the parent roundcubemail directory, not public_html
+if [[ "$(basename "$CUR_INSTALL_DIR")" = "public_html" ]]; then
+   CUR_INSTALL_DIR="$(dirname "$CUR_INSTALL_DIR")"
+fi
+
 if [[ ! -d "$CUR_INSTALL_DIR" ]] ; then
 	fatal "No current installation of roundcube found!"
 fi