diff --git a/README.md b/README.md
index aaa5c2a..e9abffa 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Dotclear is an open-source web publishing software.
 
-**Shipped version:** 2.18
+**Shipped version:** 2.18.1
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 7b1085f..216ce49 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,7 @@
-SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.18.tar.gz
-SOURCE_SUM=6a99672db2c20e392d776c680dc87d5bc66962e8307ecf81a63feb6c5d2f398a
+SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.18.1.zip
+SOURCE_SUM=ea9874c0a796c798efa31c9a8b747707dc678b7244a4d385975466dc4ff5b88e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=2
+SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
+SOURCE_EXTRACT=true
diff --git a/manifest.json b/manifest.json
index a05b986..3b0e5eb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Blog publishing application",
         "fr": "Moteur de blog"
     },
-    "version": "2.18~ynh1",
+    "version": "2.18.1~ynh1",
     "license": "GPL-2.0-or-later",
     "url": "https://dotclear.org/",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 6cef892..78200c1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -73,13 +73,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 ynh_script_progression --message="Setting up source files..." --weight=4
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
-
-# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
-src_url=$(grep 'SOURCE_URL=' "../conf/app.src" | cut -d= -f2-)
-if ! curl --output /dev/null --silent --head --fail "$src_url"; then
-	ynh_replace_string --match_string="latest" --replace_string="attic" --target_file="../conf/app.src"
-fi
-
+# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
 chmod 750 "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index d738326..220abc0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -102,12 +102,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	# Download, check integrity, uncompress and patch the source from app.src
-	# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
-	src_url=$(grep 'SOURCE_URL=' "../conf/app.src" | cut -d= -f2-)
-	if ! curl --output /dev/null --silent --head --fail "$src_url"; then
-		ynh_replace_string "latest" "attic" ../conf/app.src
-	fi
+	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"