diff --git a/install_on_raspberry.md b/install_on_raspberry.md
index fc27d7bc..393da50b 100644
--- a/install_on_raspberry.md
+++ b/install_on_raspberry.md
@@ -2,26 +2,24 @@
*Find other ways to install YunoHost **[here](/install)**.*
-## Requirements
+## Pre-requisite
- A Raspberry Pi model 1, 2 or 3
-- A SD card: **4GB** capacity (or more) and **class10** speed rate is highly recommended
-- A different computer to read this guide and access your Raspberry Pi
-- A screen and a keyboard, recommended if a problem occurs and you want to control your Raspberry Pi
-- A [reasonable ISP](/isp), preferably with a good and unlimited upload bandwidth
+- An SD card: **4GB** capacity (or more) and **class10** speed rate are highly recommended
+- An other computer to read this guide and access to your Raspberry Pi
+- A screen and a keyboard are recommended to control your Raspberry Pi if a problem occurs.
+- A [reasonable ISP](/isp), preferably with a good and unlimited upstream bandwidth
- **YunoHost Raspberry Pi images**, available here:
- - [Official Wheezy/YunoHost 2.2 created the 4th June 2015](https://build.yunohost.org/yunohost-rpi2_wheezy.7z)
- - [Non-official Jessie/YunoHost 2.2 created the 5th December 2015](https://forum.yunohost.org/t/building-a-new-image-for-raspberry-debian-jessie-fr-en/1101/2)
+build.yunohost.org
-
**This two images are old**. YunoHost image for Raspberry Pi is not maintained, feel free to contribute and contact us if you would like to [maintain an image](build_arm_image_en) for YunoHost project.
-
+There are two ways of installing, depending on if you can start your server from scratch or not.
---
-## Installation steps
+## Installation using an image
1. Copy image to the SD card
@@ -29,17 +27,66 @@
3. Post-install
+## Manual installation
+
+Follow these steps if you can't start from scratch and simply use an image. Note - Yunohost installation is different if you have a Raspberry Pi Zero, be careful!
+
+1. Install git
+```bash
+sudo apt-get install git
+```
+
+2. Clone the Yunohost install script repository
+```bash
+git clone https://github.com/YunoHost/install_script /tmp/install_script
+```
+
+3. The root user must have a password set, if it isn't the case, set it (whithout the install script failed):
+```bash
+sudo passwd root
+```
+
+4. Update the Pi:
+```bash
+apt-get update ; apt-get dist-upgrade -y ; apt-get install rpi-update ; rpi-update ; reboot`
+```
+
+This will upgrade the Pi, then reboot.
+
+
+Raspberry Pi Zero users: follow these specific steps for a successfull installation.
+
+
+
+0.1 Install metronome manually:
+```bash
+apt-get install -y ssl-cert lua-event lua-expat lua-socket lua-sec lua-filesystem
+wget https://github.com/YunoHost/metronome/archive/debian/3.7.9+33b7572-1.zip
+unzip 3.7.9+33b7572-1.zip
+cd metronome-debian-3.7.9-33b7572-1
+dpkg-buildpackage -rfakeroot -uc -b -d
+cd ..
+dpkg -i metronome_3.7.9+33b7572-1_armhf.deb
+apt-mark hold metronome
+```
+
+4. Execute the installation script
+```bash
+cd /tmp/install_script && sudo ./install_yunohost
+```
---
-### Recommended after running the post-installation
+### Recommended after post-installation
* Connect via SSH: **root@IP.OF.RPI** (password: **yunohost**)
* Change root password: `passwd root`
* Upgrade system: `apt-get update && apt-get dist-upgrade && rpi-update`
+* Configure the language, keyboard layout and timezone with the **raspi-config** tool
---
#### Build image
* [Create a Raspberry Pi image](/build_arm_image_en)
-***Need help during one of these steps? [Get support!](/support)***
+***If you need help during one of these steps, do not hesitate to use [our support tools](/support).***
+