diff --git a/README.md b/README.md
index 67a1ce1..46c195f 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ If User Mode is configured Multiple users, the app be used by multiple users
 #### Supported architectures
 
 * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/writefreely/)
-* ARMv8-A - **Not supported** [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)
 * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/writefreely%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/writefreely/)
 
 ## Limitations
diff --git a/conf/arm.src b/conf/arm.src
new file mode 100644
index 0000000..94fa552
--- /dev/null
+++ b/conf/arm.src
@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/YunoHost-Apps/writefreely_ynh/releases/download/v0.8.1/writefreely_0.8.1_linux_arm64.tar.gz
+SOURCE_SUM=6490b34dbc6857d1b0f60d1d6ddb9c20b29e742e0fa10662b49c311970818d14
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
diff --git a/conf/app.src b/conf/x86-64.src
similarity index 100%
rename from conf/app.src
rename to conf/x86-64.src
diff --git a/scripts/backup b/scripts/backup
index b41461a..05f7f25 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -7,7 +7,6 @@
 #=================================================
 
 source ../settings/scripts/_common.sh
-source ../settings/scripts/detect_arch
 source ../settings/scripts/ynh_systemd_action
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/change_url b/scripts/change_url
index a65cba6..be9cfcf 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -6,19 +6,9 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source detect_arch
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # RETRIEVE ARGUMENTS
 #=================================================
diff --git a/scripts/detect_arch b/scripts/detect_arch
index 4e258d9..72440b7 100644
--- a/scripts/detect_arch
+++ b/scripts/detect_arch
@@ -6,6 +6,8 @@ elif [ -n "$(uname -m | grep 86)" ]; then
 	architecture="i386"
 elif [ -n "$(uname -m | grep arm)" ]; then
 	architecture="arm"
+elif [ -n "$(uname -m | grep aarch64)" ]; then
+	architecture="arm"
 else
 	ynh_die "Unable to detect your achitecture, please open a bug describing \
         your hardware and the result of the command \"uname -m\"." 1
diff --git a/scripts/install b/scripts/install
index 85ff14d..1d3a262 100755
--- a/scripts/install
+++ b/scripts/install
@@ -70,15 +70,6 @@ path_url=$(ynh_normalize_url_path $path_url)
 # Register (book) web path
 ynh_webpath_register $app $domain $path_url
 
-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
@@ -152,7 +143,7 @@ ynh_print_info "Setting up source files ..."
 
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source "$final_path"
+ynh_setup_source "$final_path" $architecture
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/remove b/scripts/remove
index 0aaaaf0..0b0eba9 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -6,7 +6,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source detect_arch
 source _common.sh
 source ynh_systemd_action
 source /usr/share/yunohost/helpers
diff --git a/scripts/restore b/scripts/restore
index 6b80dee..d2eae01 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -7,7 +7,6 @@
 #=================================================
 
 source ../settings/scripts/_common.sh
-source ../settings/scripts/detect_arch
 source ../settings/scripts/ynh_systemd_action
 source /usr/share/yunohost/helpers
 
@@ -44,15 +43,6 @@ ynh_webpath_available $domain $path_url \
 test ! -d $final_path \
 	|| ynh_die "There is already a directory: $final_path "
 
-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a37ed12..c566b44 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -107,7 +107,7 @@ ynh_print_info "Upgrading source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_setup_source "$final_path"
+    ynh_setup_source "$final_path" $architecture
 fi
 
 #=================================================