diff --git a/README.rst b/README.rst
index b336f7d..0c4cc0a 100644
--- a/README.rst
+++ b/README.rst
@@ -162,6 +162,60 @@ config, along with the environment variables that would override them.
 - ``package.name`` -> ``$APP_PACKAGE_NAME``
 - ``android.p4a_dir`` -> ``$APP_ANDROID_P4A_DIR``
 
+Buildozer Virtual Machine
+-------------------------
+
+The current virtual machine (available via kivy.org/downloads/) allow
+you to have a ready to use vm for building android application. But
+the current one have many flaw.
+We're in the process to deliver a new VM that fixes most of them.
+
+# Using shared folders
+
+The Virtualbox Guest tools are outdated, install the latest one:
+- in the Virtualbox: `Devices` -> `Install Guest Additions CD images`
+- in the guest/linux: Go to the cdrom and run the installer
+
+The `kivy` user is not in the `vboxsf` groups, so in a terminal:
+- `sudo adduser kivy vboxsf`
+- reboot the vm
+
+VirtualBox filesystem doesn't support symlink anymore (don't
+try the setextradata solution, it doesn't work.). So you must
+do the build outside the shared folder. One solution:
+- `sudo mkdir /build/buildozer-myapp`
+- `sudo chown kivy /build/buildozer-myapp`
+- In your buildozer.spec, section `[buildozer]`, set `build_dir = /build/buildozer-myapp`
+
+# No space left
+
+If you build on the current VM, you'll hit the no space left on device:
+- Stop your VM
+- Adjust the disk size to 20GB: `VBoxManage modifyhd ~/Downloads/Buildozer/Buildozer.vdi --resize 20000`
+- Download the http://www.slitaz.org/en/get/#stable
+- In the virtualbox, `Devices` -> `Optical Drive` -> Select the slitaz iso
+- Reboot the VM
+- In slitaz, open a terminal, and unmount the swap: `swapoff -a`
+- Open gparted
+  - delete sda2
+  - extend sda1 to 18000
+  - add a primary partition, set the format to linux-swap
+  - you should have a sda2 partition
+  - save
+- Unmount the slitaz iso `Devices` -> `Optical Drive` -> `Eject`
+- Reset/Restart the VM
+- Check your disk is 20GB: `df -h`
+
+# Using your devices via the VM
+
+There is a little icon on the bottom left that represent an USB plug.
+Select it, and select your android device on it. Then you can check:
+- `buildozer android_new adb -- devices`
+
+If it doesn't, use Google. They are so many differents way / issues
+depending your phone that Google will be your only source of
+information, not us :)
+
 Support
 -------