diff --git a/.abf.yml b/.abf.yml
index d1e7123..51ba55e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  "fusioninventory-for-glpi-metapackage_2.3.6.tar.gz": 95bca0f368b2e7590982b22224d006a799db33b0
+  "fusioninventory-for-glpi-metapackage_0.80_1.1.tar.gz": 100cb31c224d51800ab6b6cd316e8e0f51d50973
diff --git a/glpi-plugin-fusioninventory.spec b/glpi-plugin-fusioninventory.spec
index c327a4f..7b6536d 100644
--- a/glpi-plugin-fusioninventory.spec
+++ b/glpi-plugin-fusioninventory.spec
@@ -1,77 +1,92 @@
-%define name glpi-plugin-fusioninventory
-%define version 2.3.6
-%define release %mkrel 1
+%if %mandriva_branch == Cooker
+%define release %mkrel 2
+%else
+%define subrel 1
+%define release %mkrel 0
+%endif
 
 %define _requires_exceptions pear(.*)
 
-Name:    %{name}
-Version: %{version}
-Release: %{release}
 Summary: fusioninventory communication server
+Name: glpi-plugin-fusioninventory
+Version: 2.4.0
+Release: %{release}
 License: GPL
-Group:   Monitoring
-Url:     http://fusioninventory.org/wordpress/
-Source0: http://forge.fusioninventory.org/attachments/download/19/fusioninventory-for-glpi-metapackage_%{version}.tar.gz
+Group: Monitoring
+URL: http://fusioninventory.org/wordpress/
+Source0: http://forge.fusioninventory.org/attachments/download/515/fusioninventory-for-glpi-metapackage_0.80_1.1.tar.gz
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}
 
 %description
 This plugin enables you to manage fusioninventory agents from GLPI.
 
 %package snmp
-Summary:        SNMP extension for fusioninventory
-Group:          Monitoring
-License:        GPL
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
+Summary: SNMP extension for fusioninventory
+Group: Monitoring
+Requires: %{name} = %{version}-%{release}
 
 %description snmp
 This plugin allow to perform remote inventory with fusioninventory agents.
 
 %package inventory
-Summary:        Inventory extension for fusioninventory
-Group:          Monitoring
-License:        GPL
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
+Summary: Inventory extension for fusioninventory
+Group: Monitoring
+Requires: %{name} = %{version}-%{release}
 
 %description inventory
 This plugin allow to perform local inventory with fusioninventory agents.
 
+%package deploy
+Summary: Deploy extension for fusioninventory
+Group: Monitoring
+Requires: %{name} = %{version}-%{release}
+
+%description deploy
+This plugin allow to deploy with fusioninventory agents.
+
 %prep
+
 %setup -q -c
 
+find . -type f | xargs chmod 644
+find . -type d | xargs chmod 755
+
 %install
-rm -rf %{buildroot}
 
 install -d -m 755 %{buildroot}%{_datadir}/glpi/plugins
-cp -pr fusioninventory %{buildroot}%{_datadir}/glpi/plugins
-cp -pr fusinvsnmp %{buildroot}%{_datadir}/glpi/plugins
-cp -pr fusinvinventory %{buildroot}%{_datadir}/glpi/plugins
+cp -rp fusinvdeploy %{buildroot}%{_datadir}/glpi/plugins/
+cp -rp fusinvinventory %{buildroot}%{_datadir}/glpi/plugins/
+cp -rp fusinvsnmp %{buildroot}%{_datadir}/glpi/plugins/
+cp -rp fusioninventory %{buildroot}%{_datadir}/glpi/plugins/
 
 rm -rf %{buildroot}%{_datadir}/glpi/plugins/fusinvsnmp/docs
 rm -rf %{buildroot}%{_datadir}/glpi/plugins/fusioninventory/docs
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
 %doc fusioninventory/docs/*.TXT
 %{_datadir}/glpi/plugins/fusioninventory
 
 %files snmp
-%defattr(-,root,root)
 %doc fusinvsnmp/docs/*.TXT
 %{_datadir}/glpi/plugins/fusinvsnmp
 
 %files inventory
-%defattr(-,root,root)
 %{_datadir}/glpi/plugins/fusinvinventory
 
+%files deploy
+%{_datadir}/glpi/plugins/fusinvdeploy
+
 
 %changelog
-* Thu Jul 07 2011 Guillaume Rousse <guillomovitch@mandriva.org> 2.3.6-1mdv2011
+* Sat Feb 04 2012 Oden Eriksson <oeriksson@mandriva.com> 2.4.0-2mdv2012.0
++ Revision: 771127
+- various fixes
+
+* Sat Feb 04 2012 Oden Eriksson <oeriksson@mandriva.com> 2.4.0-1
++ Revision: 771088
+- 2.4.0
+
+* Thu Jul 07 2011 Guillaume Rousse <guillomovitch@mandriva.org> 2.3.6-1
 + Revision: 689109
 - new version