diff --git a/.abf.yml b/.abf.yml
index 1123ee6..0c6b8df 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
 sources:
   "Ocsinventory-Agent-1.1.2.1.tar.gz": ff8395bd281ddfdb9c3f9106b51aa75ac542f169
+  "Ocsinventory-Unix-Agent-2.0.5.tar.gz": 59c63dd7c9102d7c165247d302fea23840ad08be
diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index f56a8bb..ea2ccb4 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -1,12 +1,12 @@
 Name:       ocsinventory-agent
-Version:    1.1.2.1
-Release:    %mkrel 2
+Version:    2.0.5
+Release:    %mkrel 1
 Epoch:      1
 Summary:    Unified client for OCS-Inventory
 License:    GPLv2+
 Group:      System/Servers
 URL:        http://www.ocsinventory-ng.org/
-Source0:    http://launchpad.net/ocsinventory-unix-agent/stable/ocsinventory-unix-agent-1.1.2/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:    http://launchpad.net/ocsinventory-unix-agent/stable/ocsinventory-unix-agent-1.1.2/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
 Patch0:     Ocsinventory-Agent-1.1.2-fix-syslog-usage.patch
 Patch1:     Ocsinventory-Agent-1.1.2-fix-dmidecode-version-test.patch
 Patch2:     Ocsinventory-Agent-1.1.2-fix-xen-dom0-identification.patch
@@ -22,7 +22,6 @@ Suggests:   perl-Proc-Daemon
 Suggests:   ipmitool
 Obsoletes:  ocsng-linux-agent
 Obsoletes:  perl-Ocsinventory
-BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}
 
 %description
@@ -30,11 +29,11 @@ Linux agent for ocs-inventory. Dialog between client computers and management
 server is based on actual standards, HTTP protocol and XML data formatting.
 
 %prep
-%setup -q -n Ocsinventory-Agent-%{version}
-%patch0 -p 1
-%patch1 -p 1
-%patch2 -p 1
-%patch3 -p 1
+%setup -q -n Ocsinventory-Unix-Agent-%{version}
+#%patch0 -p 1
+#%patch1 -p 1
+#%patch2 -p 1
+#%patch3 -p 1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -82,79 +81,13 @@ rm -rf %{buildroot}
 %defattr(-,root, root)
 %doc AUTHORS Changes LICENSE README THANKS
 %{_sbindir}/%{name}
+%{_sbindir}/ipdiscover
 %{_mandir}/man1/%{name}.*
 %{_mandir}/man3/Ocsinventory::Agent::XML::Inventory.3pm*
+%{_mandir}/man3/Ocsinventory::Agent::Common.3pm*
 %{perl_vendorlib}/Ocsinventory
 %config(noreplace) %{_sysconfdir}/cron.daily/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/ocsinventory
 %{_localstatedir}/log/%{name}
 %{_localstatedir}/lib/%{name}
-
-
-%changelog
-* Fri Feb 04 2011 Guillaume Rousse <guillomovitch@mandriva.org> 1:1.1.2.1-2mdv2011.0
-+ Revision: 635830
-- fix cron task (bug #61969)
-
-* Sat Nov 27 2010 Guillaume Rousse <guillomovitch@mandriva.org> 1:1.1.2.1-1mdv2011.0
-+ Revision: 601954
-- new version
-
-* Mon Jun 14 2010 Guillaume Rousse <guillomovitch@mandriva.org> 1:1.1.2-4mdv2011.0
-+ Revision: 548020
-- drop useless explicit dependencies
-- cleanup space and tabs mixture
-
-* Mon Jun 14 2010 Anne Nicolas <ennael@mandriva.org> 1:1.1.2-4mdv2010.1
-+ Revision: 547999
-- Fix requires and suggests (#59459)
-
-* Sat May 29 2010 Guillaume Rousse <guillomovitch@mandriva.org> 1:1.1.2-3mdv2010.1
-+ Revision: 546575
-- patch1: fix dmidecode version test
-- patch2: fix xen dom0 identification
-- patch3: add bios information for xen PV hosts
-- suggests optional perl modules and tools (fix #59459)
-
-* Thu Apr 29 2010 Guillaume Rousse <guillomovitch@mandriva.org> 1:1.1.2-2mdv2010.1
-+ Revision: 540800
-- patch0: fix syslog usage
-- new version
-- fix cron task
-
-* Mon Nov 30 2009 Guillaume Rousse <guillomovitch@mandriva.org> 1.02-2mdv2010.1
-+ Revision: 471940
-- ensure cron script is executable
-
-* Sat Jun 06 2009 Guillaume Rousse <guillomovitch@mandriva.org> 1.02-1mdv2010.0
-+ Revision: 383255
-- new version
-- merge perl package, no need for a distinct one
-- use herein document whenever possible
-- switch to a daily cron job, as per default installation
-
-* Sun May 10 2009 Guillaume Rousse <guillomovitch@mandriva.org> 1.0.1-1mdv2010.0
-+ Revision: 373950
-- new version
-- drop patches, not needed anymore
-
-* Fri Aug 08 2008 Thierry Vignaud <tv@mandriva.org> 0.0.9.2-2mdv2009.0
-+ Revision: 268323
-- rebuild early 2009.0 package (before pixel changes)
-
-  + Pixel <pixel@mandriva.com>
-    - adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
-
-* Thu May 15 2008 Oden Eriksson <oeriksson@mandriva.com> 0.0.9.2-1mdv2009.0
-+ Revision: 207628
-- remove versioned deps
-
-* Wed May 14 2008 Oden Eriksson <oeriksson@mandriva.com> 0.0.9.2-0.1mdv2009.0
-+ Revision: 207254
-- import ocsinventory-agent
-
-
-* Wed May 14 2008 Oden Eriksson <oeriksson@mandriva.com> 0.0.9.2-0.1mdv2009.0
-- initial Mandriva package (requested by psycocat)
-- used the fedora package as a start