diff --git a/README.md b/README.md
index 860bd5c..24bea08 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,12 @@ You can also configure Simple Torrent by editing this file `/var/www/simple-torr
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/)
+
+## Limitations
+
+* Sorry, this app cannot be installed on a 32-bit ARM machine.
 
 ## Links
 
diff --git a/README_fr.md b/README_fr.md
index 0cf7c96..78dfb1d 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -38,8 +38,12 @@ Vous pouvez configurer Simple Torrent en modifiant le fichier `/var/www/simple-t
 
 #### Architectures supportées
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/)
+
+## Limitations
+
+* Désolé, cette application ne peut pas être installée sur une machine ARM 32 bits.
 
 ## Liens
 
diff --git a/scripts/install b/scripts/install
index a0bd77a..adda725 100644
--- a/scripts/install
+++ b/scripts/install
@@ -32,6 +32,12 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_script_progression --message="Validating installation parameters..." --weight=1
 
+# Check machine architecture (in particular, we don't support ARM 32bit machines)
+if [ $architecture == "unknown" ]
+then
+	ynh_die --message="Sorry, this app cannot be installed on a 32-bit ARM machine."
+fi
+
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
 
diff --git a/scripts/restore b/scripts/restore
index 0c07e67..9565f98 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -65,7 +65,7 @@ ynh_restore_file --origin_path="$final_path"
 #=================================================
 # RESTORE DATA
 #=================================================
-ynh_script_progression --message="Restoring $app data..."  --weight=10
+ynh_script_progression --message="Restoring $app data..." --weight=10
 
 ynh_restore_file --origin_path="/home/yunohost.app/$app" --not_mandatory
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fe09aa9..7812eac 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -35,6 +35,12 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+# Check machine architecture (in particular, we don't support ARM 32bit machines)
+if [ $architecture == "unknown" ]
+then
+	ynh_die --message="Sorry, this app cannot be installed on a 32-bit ARM machine."
+fi
+
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
 	ynh_legacy_permissions_delete_all