diff --git a/Makefile b/Makefile
index 1adba321..1f78dd60 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,10 @@ help:
 
 build:            ## Build the PHAR
 build: vendor
+	# Cleanup existing artefacts
 	rm -f bin/php-scoper.phar
 	rm -rf build
+	# Delete local `composer.lock` to ensure fresh dependencies are used
 	rm composer.lock
 	#
 	# As of now, files included in `autoload-dev` are not excluded from the
@@ -28,10 +30,11 @@ build: vendor
 	# As a result, the the flag `--no-dev` for `composer install` cannot
 	# be used and `box.json.dist` must include the `tests` directory
 	#
-	composer install --prefer-dist --classmap-authoritative
+	composer install --prefer-dist
 	php -d zend.enable_gc=0 bin/php-scoper.php add-prefix --force
 	cd build && composer dump-autoload --classmap-authoritative
 	php -d zend.enable_gc=0 $(BOX) build
+	# Install back all the dependencies
 	composer install
 
 
diff --git a/README.md b/README.md
index 47bc5bdc..a4ec2861 100644
--- a/README.md
+++ b/README.md
@@ -25,17 +25,41 @@ the vendors of the loaded project, if the vendors are required in incompatible
 versions.
 
 
-## Usage
+## Installation
 
-Use PHP-Scoper like this:
+You can install PHP-Scoper with Composer:
 
+```bash
+composer global require humbug/php-scoper:dev-master
 ```
-$ php-scoper add-prefix MyPhar\\ .
+
+If you cannot install it because of a dependency conflict or you prefer to
+install it for your project, we recommend you to take a look at
+[bamarni/composer-bin-plugin][bamarni/composer-bin-plugin]. Example:
+
+```bash
+composer require --dev bamarni/composer-bin-plugin
+composer bin php-scoper require --dev humbug/php-scoper:dev-master
 ```
 
-The first argument is the prefix to add to all namespace declarations and class 
-usages. The second argument is one or more files/directories which should be 
-processed.
+A PHAR should be availaible soon as well.
+
+
+## Usage
+
+```bash
+php-scoper add-prefix
+```
+
+This will prefix all the files found in the current working directory.
+The prefixed files will be accessible in a `build` folder. You can
+then use the prefixed code to build your PHAR.
+
+**Warning**: After prefexing the files, if you are relying on Composer
+for the autoloading, dumping the autoloader again is required.
+
+For a more concrete example, you can take a look at PHP-Scoper's build
+step in [Makefile](Makefile).
 
 
 ## Contributing
@@ -52,3 +76,4 @@ Project originally created by: [Bernhard Schussek] ([@webmozart]) which has then
 [Bernhard Schussek]: https://webmozart.io/
 [@webmozart]: https://twitter.com/webmozart
 [humbug]: https://github.com/humbug
+[bamarni/composer-bin-plugin]: https://github.com/bamarni/composer-bin-plugin
\ No newline at end of file