diff --git a/createlinks b/createlinks
deleted file mode 100644
index e156574..0000000
--- a/createlinks
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl -w
-use esmith::Build::CreateLinks qw(:all);
-
-templates2events("/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg", qw(wpkg-update bootstrap-console-save));
-templates2events("/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg", qw(wpkg-update bootstrap-console-save));
-
diff --git a/packages/fusioninventory.xml b/packages/fusioninventory.xml
index a9b6ba5..117319e 100755
--- a/packages/fusioninventory.xml
+++ b/packages/fusioninventory.xml
@@ -2,25 +2,17 @@
 <packages>
     <package id="fusioninventory"
              name="Agent d'inventaire reseau"
-             revision="17"
+             revision="18"
              priority="10">
 
-        <variable name="PKG_VERSION" value="2.2.7-4" />
-        <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%\FusionInventory-Agent\" />
-        <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%\FusionInventory-Agent\" />
-        <variable architecture="x86" name="REG_PATH" value="%SETTINGS%\fusioninventory\fusioninventory_x86.reg" />
-        <variable architecture="x64" name="REG_PATH" value="%SETTINGS%\fusioninventory\fusioninventory_x64.reg" />
+        <variable name="PKG_VERSION" value="2.3.0-1" />
+        <variable name="INSTALL_PATH" value="%PROGRAMFILES%\FusionInventory-Agent\" />
+        <variable name="INSTALL_FLAGS" value="/S /acceptlicense /execmode=Service /httpd-ip=127.0.0.1 installtype=/from-scratch /no-p2p /user='%FUSINV_USER%' /password='%FUSINV_PASS%' /server='%FUSINV_SERVER%'" />
  
 	<check type="uninstall" condition="versiongreaterorequal" path="FusionInventory Agent" value="%PKG_VERSION%" />
 
-        <install cmd='%SOFTWARE%\fusioninventory\fusioninventory-agent_windows-i386_%PKG_VERSION%.exe /S' />
-        <install cmd='%COMSPEC% /C sc stop FusionInventory-Agent'>
-            <exit code='any' />
-        </install>
-        <install cmd='%COMSPEC% /C regedit /s "%REG_PATH%"' />
-        <install cmd='%COMSPEC% /C sc start FusionInventory-Agent'>
-            <exit code='any' />
-        </install>
+        <install architecture="x86" cmd='%SOFTWARE%\fusioninventory\fusioninventory-agent_windows-x86_%PKG_VERSION%.exe %INSTALL_FLAGS%' />
+        <install architecture="x64" cmd='%SOFTWARE%\fusioninventory\fusioninventory-agent_windows-x64_%PKG_VERSION%.exe %INSTALL_FLAGS%' />
  
         <upgrade include="install" />
 
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/20FusionInventory b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/20FusionInventory
new file mode 100644
index 0000000..5ddf6eb
--- /dev/null
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/20FusionInventory
@@ -0,0 +1,3 @@
+       <variable name="FUSINV_USER" value="{${'fusioninventory-agent'}{'User'} || $DomainName}" />
+       <variable name="FUSINV_PASS" value="{${'fusioninventory-agent'}{'Password'} || 'secret'}" />
+       <variable name="FUSINV_SERVER" value="{${'fusioninventory-agent'}{'Server'} || 'https://inventory.firewall-services.com/'}" />
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All
deleted file mode 100644
index 1aa1222..0000000
--- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-
-my $server = ${'fusioninventory-agent'}{'Server'} || 'https://inventory.firewall-services.com/';
-my $user = ${'fusioninventory-agent'}{'User'} || $DomainName;
-my $pass = ${'fusioninventory-agent'}{'Password'} || 'secret';
-
-my $out .=<<"EOF";
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\FusionInventory-Agent]
-"server"="$server"
-"tag"="$DomainName"
-"user"="$user"
-"password"="$pass"
-"realm"=""
-"ca-cert-file"=""
-"no-ssl-check"="0"
-"proxy"=""
-"rpc-port"=""
-"debug"="1"
-"rpc-trust-localhost"="1"
-"scan-homedirs"="0"
-"basevardir"=-
-"share-dir"=-
-"logfile"=-
-"logfile-maxsize"="5"
-
-EOF
-
-$out =~ s/\n/\r\n/g;
-
-$OUT = $out;
-
-}
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/template-begin
deleted file mode 100644
index e69de29..0000000
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All
deleted file mode 100644
index 597ec2d..0000000
--- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-
-my $server = ${'fusioninventory-agent'}{'Server'} || 'https://inventory.firewall-services.com/';
-my $user = ${'fusioninventory-agent'}{'User'} || $DomainName;
-my $pass = ${'fusioninventory-agent'}{'Password'} || 'secret';
-
-my $out .=<<"EOF";
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\\SOFTWARE\\FusionInventory-Agent]
-"server"="$server"
-"tag"="$DomainName"
-"user"="$user"
-"password"="$pass"
-"realm"=""
-"ca-cert-file"=""
-"no-ssl-check"="0"
-"proxy"=""
-"rpc-port"=""
-"debug"="1"
-"rpc-trust-localhost"="1"
-"scan-homedirs"="0"
-"basevardir"=-
-"share-dir"=-
-"logfile"=-
-"logfile-maxsize"="5"
-
-EOF
-
-$out =~ s/\n/\r\n/g;
-
-$OUT = $out;
-
-}
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/template-begin
deleted file mode 100644
index e69de29..0000000
diff --git a/softwares/fusioninventory-agent_windows-x64_2.3.0-1.exe b/softwares/fusioninventory-agent_windows-x64_2.3.0-1.exe
new file mode 100644
index 0000000..d65092f
Binary files /dev/null and b/softwares/fusioninventory-agent_windows-x64_2.3.0-1.exe differ
diff --git a/softwares/fusioninventory-agent_windows-i386_2.2.7-4.exe b/softwares/fusioninventory-agent_windows-x86_2.3.0-1.exe
similarity index 57%
rename from softwares/fusioninventory-agent_windows-i386_2.2.7-4.exe
rename to softwares/fusioninventory-agent_windows-x86_2.3.0-1.exe
index e9fa21e..79b0660 100644
Binary files a/softwares/fusioninventory-agent_windows-i386_2.2.7-4.exe and b/softwares/fusioninventory-agent_windows-x86_2.3.0-1.exe differ
diff --git a/wpkg-fusioninventory.spec b/wpkg-fusioninventory.spec
index 07f2a8d..dd0d2a2 100644
--- a/wpkg-fusioninventory.spec
+++ b/wpkg-fusioninventory.spec
@@ -26,13 +26,11 @@ Requires:	ipasserelle-gp
 %setup -q -n %{name}-%{version}
 
 %build
-perl createlinks
 unix2dos packages/*
 
 %install
 /bin/rm -rf %{buildroot}
 cp -a root %{buildroot}/
-mkdir -p %{buildroot}/home/e-smith/files/shares/wpkg/files/settings/fusioninventory
 mkdir -p %{buildroot}/home/e-smith/files/shares/wpkg/files/packages
 mkdir -p %{buildroot}/home/e-smith/files/shares/wpkg/files/softwares/%{package}
 cp -r softwares/* %{buildroot}/home/e-smith/files/shares/wpkg/files/softwares/%{package}/