diff --git a/data/services.yml b/data/services.yml
index ec5c37d42..03cc3ed33 100644
--- a/data/services.yml
+++ b/data/services.yml
@@ -31,7 +31,7 @@ php5-fpm:
    status: service
    log: /var/log/php5-fpm.log
 yunohost-api:
-   status: cat /usr/share/pyshared/yunohost-cli/twistd.pid
+    status: ps aux | grep yunohost-api | grep -v grep
    log: /var/log/yunohost.log
 postgrey:
    status: service
diff --git a/tools.py b/tools.py
index 7fa5d348c..3473173be 100644
--- a/tools.py
+++ b/tools.py
@@ -363,7 +363,7 @@ def tools_upgrade(ignore_apps=False, ignore_packages=False):
         
         # If API call
         if not os.isatty(1):
-            critical_packages = ["yunohost-cli", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"]
+            critical_packages = ["moulinette", "moulinette-yunohost", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"]
             for pkg in cache.get_changes():
                 if pkg.name in critical_packages:
                     # Temporarily keep package ...