diff --git a/.gitignore b/.gitignore
index 0636e04..8607f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@
 /FusionInventory-Agent-2.4.tar.gz
 /FusionInventory-Agent-2.4.1.tar.gz
 /FusionInventory-Agent-2.4.2.tar.gz
+/FusionInventory-Agent-2.4.3.tar.gz
+/FusionInventory-Agent-2.5.tar.gz
+/FusionInventory-Agent-2.5.1.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 4fbb79a..e1fc3a3 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -5,11 +5,10 @@
 
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
-Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.4.2
+Version:     2.5.1
 Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
@@ -57,7 +56,7 @@ You can add additional packages for optional tasks:
 * fusioninventory-agent-task-collect
     Custom information retrieval support
 * fusioninventory-agent-task-wakeonlan
-    not included due to a licensing issue for perl-Net-Write
+    Wake o lan task
 
 
 %package -n perl-FusionInventory-Agent
@@ -82,22 +81,9 @@ Requires:   %{name} = %{version}-%{release}
 fusioninventory-agent-task-ESX ask the running service agent to inventory an 
 VMWare vCenter/ESX/ESXi server through SOAP interface
 
-%package yum-plugin
-Summary:       Ask FusionInventory agent to send an inventory when yum exits
-Group:         System Environment/Base
-BuildArch:     noarch
-Requires:      yum
-Requires:      %{name}
-
-%description yum-plugin
-fusioninventory-agent-yum-plugin asks the running service agent to send an
-inventory when yum exits.
-
-This requires the service to be running with the --rpc-trust-localhost option.
 
 %package task-network
 Summary:    NetDiscovery and NetInventory task for FusionInventory
-Group:      Applications/System
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
@@ -106,7 +92,6 @@ fusioninventory-task-netdiscovery and fusioninventory-task-netinventory
 
 %package task-deploy
 Summary:    Software deployment support for FusionInventory agent
-Group:      Applications/System
 BuildArch:  noarch
 Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Archive::Extract)
@@ -114,22 +99,16 @@ Requires:   perl(Archive::Extract)
 %description task-deploy
 This package provides software deployment support for FusionInventory-agent
 
-%if !%{defined perl_net_write}
-# Excluded due to the absence of perl-Net-Write
-# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora
 %package task-wakeonlan
 Summary:    WakeOnLan task for FusionInventory
-Group:      Applications/System
 BuildArch:  noarch
 Requires:   %{name} = %{version}-%{release}
 
 %description task-wakeonlan
 fusioninventory-task-wakeonlan
-%endif
 
 %package task-inventory
 Summary:    Inventory task for FusionInventory
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Net::CUPS)
 Requires:   perl(Parse::EDID)
@@ -139,7 +118,6 @@ fusioninventory-task-inventory
 
 %package task-collect
 Summary:    Custom information retrieval support for FusionInventory agent
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 
 %description task-collect
@@ -148,7 +126,6 @@ FusionInventory agent
 
 %package cron
 Summary:    Cron for FusionInventory agent
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 
 %description cron
@@ -175,7 +152,7 @@ cat <<EOF | tee %{name}.conf
 #
 # Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-# Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
+# Global options (debug for verbose log)
 OPTIONS="--debug "
 
 # Mode, change to "cron" to activate
@@ -220,9 +197,6 @@ install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
 install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
-# Yum plugin installation
-install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
-install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
 
 %check
 #make test
@@ -243,6 +217,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
 %config(noreplace) %{_sysconfdir}/fusioninventory/conf.d
+%config(noreplace) %{_sysconfdir}/fusioninventory/inventory-server-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/server-test-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/ssl-server-plugin.cfg
+
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
 %{_bindir}/fusioninventory-agent
@@ -255,19 +233,14 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %dir %{_datadir}/fusioninventory/lib/FusionInventory
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task
-#excluding sub-packages files
-#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/
-
 
 
 %files -n perl-FusionInventory-Agent
 %doc Changes LICENSE THANKS
+#excluding sub-packages files
+#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/*
 %{_datadir}/fusioninventory
 
-%files yum-plugin
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
-%{_prefix}/lib/yum-plugins/%{name}.*
-
 %files task-esx
 %{_bindir}/fusioninventory-esx
 %{_mandir}/man1/fusioninventory-esx.1*
@@ -286,15 +259,15 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy
 
-# Excluding task-wakeonlan
-#%%files task-wakeonlan
-%exclude %{_bindir}/fusioninventory-wakeonlan
-%exclude %{_mandir}/man1/fusioninventory-wakeonlan.1*
-%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
+%files task-wakeonlan
+%{_bindir}/fusioninventory-wakeonlan
+%{_mandir}/man1/fusioninventory-wakeonlan.1*
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
 
 %files task-inventory
 %{_bindir}/fusioninventory-inventory
-%{_mandir}/man1/fusioninventory-inventory.1*
+%{_bindir}/fusioninventory-remoteinventory
+%{_mandir}/man1/fusioninventory-*inventory.1*
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory
 
@@ -307,6 +280,34 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Mon Jul 08 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.1-1
+- Last upstream release
+- Remove patches applied upstream
+
+* Tue May 07 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-4
+- Add patch to fix SSL on with http modules
+
+* Thu May 02 2019 Guillaume Bougard <gbougard AT teclib DOT com> - 2.5-3
+- Add patches to fix agent HTTP server plugins integration
+
+* Thu Apr 18 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-2
+- Re-add tasks files in main perl package, to solve dependencies issues on package
+
+* Mon Apr 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-1
+- Last upstream release
+- Tasks files were provided also in main perl package
+- Apply upstream minor fixes patch
+- task-wakeonlan is back (see https://github.com/fusioninventory/fusioninventory-agent/issues/495#issuecomment-435110369 about dependancy issue)
+
+* Tue Feb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
+- Remove yum plugin (and therefore dependency on yum)
+
+* Mon Feb 25 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.3-1
+- Last upstream release
+
+* Tue Dec 18 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.2-2
+- Rebuild for BZ #1650041
+
 * Wed Oct 03 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.2-1
 - Last upstream release
 - Drop patch applied upstream
diff --git a/sources b/sources
index 5171ea3..3592c0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.4.2.tar.gz) = 02da9013011de3964ffff5f320516aa1a44aa0bc88f4b5ca5de0224feb7567ed9cb5c3529309ce42bfcc87cbb20f131d88c95ebe2136eb18d35b2837cebda45f
+SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955