diff --git a/Makefile b/Makefile
index 3597f4dd0..10f6f8002 100644
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,84 @@
 GITREMOTE=https://github.com/roundcube/roundcubemail.git
 GITBRANCH=release-1.5
 GPGKEY=devs@roundcube.net
 VERSION=1.5-git
 PHP_VERSION=5.5
 SEDI=sed -i
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 	SEDI=sed -i ''
 endif
 
 all: clean complete dependent framework
 
 complete: roundcubemail-git
 	cp -RH roundcubemail-git roundcubemail-$(VERSION)
 	(cd roundcubemail-$(VERSION); cp composer.json-dist composer.json)
 	(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.1" --no-update --no-install)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar require "symfony/polyfill-intl-idn:1.19.0" --no-install)
+	(cd roundcubemail-$(VERSION); php /tmp/composer.phar require "roundcube/plugin-installer:0.3.3" --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 install --prefer-dist --no-dev --no-interaction)
 	(cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset platform)
 	(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 jsdeps.json bin/install-jsdeps.sh *.orig; rm -rf vendor/masterminds/html5/test vendor/pear/*/tests vendor/*/*/.git* vendor/pear/crypt_gpg/tools vendor/pear/console_commandline/docs vendor/pear/mail_mime/scripts vendor/pear/net_ldap2/doc vendor/pear/net_smtp/docs vendor/pear/net_smtp/examples vendor/pear/net_smtp/README.rst vendor/endroid/qrcode/tests temp/js_cache)
 	tar czf roundcubemail-$(VERSION)-complete.tar.gz roundcubemail-$(VERSION)
 	rm -rf roundcubemail-$(VERSION)
 
 dependent: roundcubemail-git
 	cp -RH roundcubemail-git roundcubemail-$(VERSION)
 	tar czf roundcubemail-$(VERSION).tar.gz roundcubemail-$(VERSION)
 	rm -rf roundcubemail-$(VERSION)
  
 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); rm -rf .phpdoc)
 	tar czf roundcube-framework-$(VERSION).tar.gz roundcube-framework-$(VERSION)
 	rm -rf roundcube-framework-$(VERSION)
 
 sign:
 	gpg -u $(GPGKEY) -a --detach-sig roundcubemail-$(VERSION).tar.gz
 	gpg -u $(GPGKEY) -a --detach-sig roundcubemail-$(VERSION)-complete.tar.gz
 	gpg -u $(GPGKEY) -a --detach-sig roundcube-framework-$(VERSION).tar.gz
 
 verify:
 	gpg -v --verify roundcubemail-$(VERSION).tar.gz.asc roundcubemail-$(VERSION).tar.gz
 	gpg -v --verify roundcubemail-$(VERSION)-complete.tar.gz.asc roundcubemail-$(VERSION)-complete.tar.gz
 	gpg -v --verify roundcube-framework-$(VERSION).tar.gz.asc roundcube-framework-$(VERSION).tar.gz
 
 shasum:
 	shasum -a 256 roundcubemail-$(VERSION).tar.gz roundcubemail-$(VERSION)-complete.tar.gz roundcube-framework-$(VERSION).tar.gz
 
 roundcubemail-git: buildtools
 	git clone --branch=$(GITBRANCH) --depth=1 $(GITREMOTE) roundcubemail-git
 	(cd roundcubemail-git; bin/jsshrink.sh; bin/updatecss.sh; bin/cssshrink.sh)
 	(cd roundcubemail-git/skins/elastic; \
 		lessc --clean-css="--s1 --advanced" styles/styles.less > styles/styles.min.css; \
 		lessc --clean-css="--s1 --advanced" styles/print.less > styles/print.min.css; \
 		lessc --clean-css="--s1 --advanced" styles/embed.less > styles/embed.min.css)
 	(cd roundcubemail-git/bin; rm -f transifexpull.sh package2composer.sh)
 	(cd roundcubemail-git; find . -name '.gitignore' | xargs rm)
 	(cd roundcubemail-git; rm -rf tests plugins/*/tests .git* .tx* .ci* .editorconfig* index-test.php Dockerfile Makefile)
 	(cd roundcubemail-git; $(SEDI) 's/1.5-git/$(VERSION)/' index.php public_html/index.php installer/index.php program/include/iniset.php program/lib/Roundcube/bootstrap.php)
 	(cd roundcubemail-git; $(SEDI) 's/# Unreleased/# Release $(VERSION)'/ CHANGELOG.md)
 
 buildtools: /tmp/composer.phar
 	npm install uglify-js
 	npm install lessc
 	npm install less-plugin-clean-css
 	npm install csso-cli
 
 /tmp/composer.phar:
-	curl -sS https://getcomposer.org/installer | php -- --install-dir=/tmp/
+	curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
+	php /tmp/composer-setup.php --install-dir=/tmp/ --2.2
 
 /tmp/phpDocumentor.phar:
 	curl -sSL https://phpdoc.org/phpDocumentor.phar -o /tmp/phpDocumentor.phar
 
 clean:
 	rm -rf roundcubemail-git
 	rm -rf roundcubemail-$(VERSION)*