diff --git a/Makefile.PL b/Makefile.PL
index c0347ac01c..e28e537186 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,7 @@
 
 use inc::Module::Install;
 use English qw(-no_match_vars);
+use lib::FusionInventory::Agent::Version;
 
 name 'FusionInventory-Agent';
 include 'Module::AutoInstall';
@@ -11,6 +12,9 @@ version_from 'lib/FusionInventory/Agent/Version.pm';
 perl_version '5.008';
 authors 'FusionInventory Team';
 
+provides
+    'FusionInventory::Agent'     => $FusionInventory::Agent::Version::VERSION;
+
 # mandatory dependencies
 requires 'File::Which'        => '0';
 requires 'LWP::UserAgent'     => '5.8';
@@ -97,6 +101,10 @@ resources
     repository  => "https://github.com/fusioninventory/fusioninventory-agent/",
     IRC         => "irc://irc.freenode.net/#fusioninventory";
 
+# Not indexing application setup
+no_index
+    file        => 'bin/setup.pm';
+
 makemaker_args(
     test => {
         TESTS => join ' ', map { glob } qw(