diff --git a/INSTALL b/INSTALL
index a188085ff..6ce578984 100644
--- a/INSTALL
+++ b/INSTALL
@@ -187,7 +187,7 @@ KNOWN ISSUES
 Installations with uw-imap server should set imap_disabled_caps = array('ESEARCH')
 in main configuration file. ESEARCH implementation in this server is broken (#1489184).
 
-PHP >= 5.6 validates the ssl certificates by default. It means that
+PHP validates the ssl certificates by default. It means that
 if IMAP/SMTP certificates are self-signed or use wrong host name you'll get
 connection errors. A solution in such cases is to set imap_conn_options,
 smtp_conn_options and managesieve_conn_options in a way described in config/defaults.inc.php.
@@ -199,12 +199,3 @@ SELINUX. Here's some sample commands for SELINUX:
     $ semanage fcontext -a -t httpd_sys_rw_content_t "/path_to_roundcube/logs(/.*)?"
     $ semanage fcontext -a -t httpd_sys_rw_content_t "/path_to_roundcube/temp(/.*)?"
     $ restorecon -Rv /path_to_roundcube/
-
-Microsoft IIS Server by default does not support WOFF fonts used in Elastic skin. It might be
-needed to add following MIME Types definitions (via web.config or IIS Manager):
-
-    .woff   application/font-woff
-    .woff2  application/font-woff2
-
-When installing on Windows be aware we're using symbolic links which may need an additional
-attention. See https://github.com/roundcube/roundcubemail/issues/7151.
diff --git a/Makefile b/Makefile
index 65fb271e3..2c5075401 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,15 @@ all: clean complete dependent framework
 
 complete: roundcubemail-git
 	cp -RH roundcubemail-git roundcubemail-$(VERSION)
+	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config version $(VERSION))
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config platform.php $(PHP_VERSION))
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar require "kolab/net_ldap3:~1.1.4" --no-update --no-install)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset suggest.kolab/net_ldap3)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset require-dev)
+	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset autoload-dev)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset repositories)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar update --prefer-dist --no-dev --no-interaction)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset platform)
-	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config version $(VERSION))
 	(cd roundcubemail-$(VERSION); bin/install-jsdeps.sh --force)
 	(cd roundcubemail-$(VERSION); bin/jsshrink.sh program/js/publickey.js; bin/jsshrink.sh plugins/managesieve/codemirror/lib/codemirror.js)
 	(cd roundcubemail-$(VERSION); rm -f jsdeps.json bin/install-jsdeps.sh *.orig; rm -rf temp/js_cache)
@@ -41,7 +42,7 @@ dependent: roundcubemail-git
 
 framework: roundcubemail-git /tmp/phpDocumentor.phar
 	cp -r roundcubemail-git/program/lib/Roundcube roundcube-framework-$(VERSION)
-	(cd roundcube-framework-$(VERSION); php /tmp/phpDocumentor.phar run -d . -t ./doc --title="Roundcube Framework" --defaultpackagename="Framework")
+	(cd roundcube-framework-$(VERSION); XDEBUG_MODE=off php /tmp/phpDocumentor.phar run -d . -t ./doc --title="Roundcube Framework" --defaultpackagename="Framework")
 	(cd roundcube-framework-$(VERSION); rm -rf .phpdoc)
 	tar czf roundcube-framework-$(VERSION).tar.gz roundcube-framework-$(VERSION)
 	rm -rf roundcube-framework-$(VERSION)
@@ -67,6 +68,7 @@ roundcubemail-git: buildtools
 	(cd roundcubemail-git; find . -name '.gitignore' | xargs rm -f)
 	(cd roundcubemail-git; find . -name '.travis.yml' | xargs rm -f)
 	(cd roundcubemail-git; rm -rf tests plugins/*/tests .git* .tx* .ci* .editorconfig* index-test.php Dockerfile Makefile package.json package-lock.json node_modules)
+	(cd roundcubemail-git; rm -f .eslintrc.js .php-cs-fixer.dist.php  phpstan.neon.dist CODE_OF_CONDUCT.md SOCIAL_WORK_GUIDELINES.md)
 	(cd roundcubemail-git; $(SEDI) 's/1.7-git/$(VERSION)/' program/include/iniset.php program/lib/Roundcube/bootstrap.php)
 	(cd roundcubemail-git; $(SEDI) 's/# Unreleased/# Release $(VERSION)'/ CHANGELOG.md)
 
diff --git a/composer.json b/composer.json
index 371720877..35dd89c91 100644
--- a/composer.json
+++ b/composer.json
@@ -7,8 +7,8 @@
         "bacon/bacon-qr-code": "^3.0.0",
         "guzzlehttp/guzzle": "^7.9.2",
         "guzzlehttp/promises": "^2.0",
-        "masterminds/html5": "~2.8.0 || ~2.9.0",
-        "pear/auth_sasl": "~1.1.0 || ~1.2.0",
+        "masterminds/html5": "~2.9.0",
+        "pear/auth_sasl": "~1.2.0",
         "pear/crypt_gpg": "~1.6.3",
         "pear/mail_mime": "~1.10.11",
         "pear/net_sieve": "~1.4.7",