diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c307b..8a8e69e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 
-## v1.0
+## v1.0.1
+
+### Features
+* Package URL is defined only for Debian Stretch.
+
+## v1.0.0
 
 ### Features
 * Install dependent packages for fusioninventory-agent.
@@ -8,4 +13,4 @@
 * If desired, remove fusioninventory-agent package.
 * Generate agent's configuration file.
 * Restart agent's service if needed.
-* Ensure to install xz-utils to allow ansible to a package out of a repos.
+* Ensure to install xz-utils to allow ansible to install a debian package manually.
diff --git a/README.md b/README.md
index bd71db5..147ba22 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ A role to manage FusionInventory agent installation and configuration.
 
 * **fusioninventory__agent_version** : The version of Fusioninventory agent to install [default : `2.4-2`].
 * **fusioninventory__agent_depend_packages** : List of dependent packages to install.
-* **fusioninventory__agent_package_url** : The URL used to download deb package for fusioninventory-agent [default : `http://debian.fusioninventory.org/downloads/fusioninventory-agent_{{ fusioninventory__agent_version }}_all.deb`].
+* **fusioninventory__agent_package_url** : The URL used to download deb package for fusioninventory-agent [default : `http://debian.fusioninventory.org/downloads/fusioninventory-agent_{{ fusioninventory__agent_version }}_all.deb` for Debian Stretch only].
 * **fusioninventory__agent_deploy_state** : What is the desired state which this role should achieve [default : `present`].
 * **fusioninventory__agent_service_name** : The service name to manage [default : `fusioninventory-agent`].
 * **fusioninventory__agent_service_manage** : If the fusioninventory agent service should be managed [default : `True`].
@@ -33,7 +33,7 @@ A role to manage FusionInventory agent installation and configuration.
       tags: ['role::fusioninventory', 'ipr', inventory']
 ```
 
-* Install fusioninventory-agent from repository (unavailable in Debian Stretch) :
+* Install fusioninventory-agent from repository (unavailable in Debian Stretch and by default for all other release) :
 
 ``` yaml
 - hosts: mynode.DOMAIN
diff --git a/defaults/main.yml b/defaults/main.yml
index 17cb0f2..422a1f0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -44,7 +44,10 @@ fusioninventory__agent_depend_packages:
 # See the official documentation for more informations :
 # http://fusioninventory.org/documentation/agent/installation/linux/deb.html
 #
-fusioninventory__agent_package_url: 'http://debian.fusioninventory.org/downloads/fusioninventory-agent_{{ fusioninventory__agent_version }}_all.deb'
+fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
+                                          if (ansible_distribution_release in
+                                              ([ "stretch" ]))
+                                          else "" }}'
                                                                    # ]]]
 # .. envvar:: fusioninventory__agent_deploy_state [[[
 #