diff --git a/.gitignore b/.gitignore
index f7c59f4..3e608ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *spec~
 /FusionInventory-Agent-Task-ESX-1.1.2.tar.gz
 /FusionInventory-Agent-Task-ESX-1.1.3.tar.gz
+/FusionInventory-Agent-Task-ESX-2.1.0.tar.gz
diff --git a/perl-FusionInventory-Agent-Task-ESX.spec b/perl-FusionInventory-Agent-Task-ESX.spec
index d1988dc..8e4f224 100644
--- a/perl-FusionInventory-Agent-Task-ESX.spec
+++ b/perl-FusionInventory-Agent-Task-ESX.spec
@@ -1,5 +1,5 @@
 Name:           perl-FusionInventory-Agent-Task-ESX
-Version:        1.1.3
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        vCenter/ESX/ESXi remote inventory for FusionInventory Agent
 License:        GPLv2+
@@ -11,16 +11,19 @@ Source0:        http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInvento
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.8.0
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(FusionInventory::Agent) >= 2.1.9
+BuildRequires:  perl(inc::Module::Install)
+BuildRequires:  perl(FusionInventory::Agent) >= 2.2.0
 BuildRequires:  perl(HTTP::Cookies)
 BuildRequires:  perl(LWP::UserAgent)
 BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::Compile)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::MockModule)
+BuildRequires:  perl(Test::MockObject)
 BuildRequires:  perl(XML::TreePP)
 BuildRequires:  perl(LWP::Protocol::https)
 
-Requires:       perl(FusionInventory::Agent) >= 2.1.9
+Requires:       perl(FusionInventory::Agent) >= 2.2.0
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?perl_default_filter}
@@ -38,10 +41,19 @@ You can import the generated files in:
 %prep
 %setup -q -n FusionInventory-Agent-Task-ESX-%{version}
 
+# Use system ones
+rm -rf inc/*
+
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL \
+     PREFIX=%{_prefix} \
+     SYSCONFDIR=%{_sysconfdir}/fusioninventory \
+     LOCALSTATEDIR=%{_localstatedir}/lib/%{name}
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -52,22 +64,29 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
+
 %check
 make test
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHOR Changes README LICENSE
+%doc Changes README LICENSE
 %{_bindir}/fusioninventory-esx
-%{perl_vendorlib}/FusionInventory/Agent/Task/ESX*
-%{perl_vendorlib}/FusionInventory/VMware
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm
+%{_datadir}/fusioninventory/lib/FusionInventory/VMware
 %{_mandir}/man1/fusioninventory-esx.*
 
 
 %changelog
+* Thu May 10 2012 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+- update to 2.1.0 for agent 2.2.0
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-Task-ESX-2.1.0/Changes
+
 * Sun Feb 26 2012 Remi Collet <Fedora@famillecollet.com> 1.1.3-1
 - update to 1.1.3
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-Task-ESX-1.1.3/Changes
diff --git a/sources b/sources
index b5c0337..2678761 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca36fc5f296f1868bc36fd862f244980  FusionInventory-Agent-Task-ESX-1.1.3.tar.gz
+23f2172288adc9fc344fc77dba730f0d  FusionInventory-Agent-Task-ESX-2.1.0.tar.gz