diff --git a/manifest.json b/manifest.json
index a0ab0df..6dbc4ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,12 +1,13 @@
 {
-    "name": "SPIP",
-    "packaging_format": 1,
+    "name": "SPIP for Yunohost",
     "id": "spip",
+    "packaging_format": 1,
     "description": {
         "en": "SPIP - publishing system for the Internet",
         "fr": "SPIP - Système de publication pour l’Internet"
     },
-    "license": "GPL-3",
+    "url": "http://www.spip.net/",
+    "license": "free",
     "maintainer": {
         "name": "cyp",
         "email": "cyp@rouquin.me",
@@ -15,33 +16,59 @@
     "requirements": {
         "yunohost": ">> 2.4.0"
     },
-    "url": "http://www.spip.net/",
-    "multi_instance": "true",
+    "multi_instance": true,
+    "services": [
+        "nginx",
+        "php5-fpm",
+        "mysql"
+    ],
     "arguments": {
         "install" : [
             {
                 "name": "domain",
+        "type": "domain",
                 "ask": {
-                    "en": "Choose a domain for SPIP"
+                    "en": "Choose a domain name for SPIP",
+                    "fr": "Choisissez un nom de domaine pour SPIP"
                 },
-                "example": "domain.org"
+                "example": "example.com"
             },
             {
                 "name": "path",
+        "type": "path",
                 "ask": {
-                    "en": "Choose a path for SPIP"
+                    "en": "Choose a path for SPIP",
+                    "fr": "Choisissez un chemin pour SPIP"
                 },
-                "example": "/spip",
-                "default": "/spip"
+                "example": "/example",
+                "default": "/example"
             },
             {
                 "name": "admin",
-                "type": "user",
+        "type": "user",
                 "ask": {
-                    "en": "Choose the SPIP administrator (must be an existing YunoHost user)",
-                    "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)"
+                    "en": "Choose an admin user",
+                    "fr": "Choisissez l’administrateur"
                 },
-                "example": "homer"
+                "example": "johndoe"
+            },
+            {
+                "name": "is_public",
+                "type": "boolean",
+                "ask": {
+                    "en": "Is it a public application?",
+                    "fr": "Est-ce une application publique ?"
+                },
+                "default": true
+            },
+            {
+                "name": "language",
+                "ask": {
+                    "en": "Choose the application language",
+                    "fr": "Choisissez la langue de l'application"
+                },
+                "choices": ["fr", "en"],
+                "default": "fr"
             }
         ]
     }