diff --git a/fusioninventory-agent b/fusioninventory-agent
index b3e83528f9..7d0ed6685b 100755
--- a/fusioninventory-agent
+++ b/fusioninventory-agent
@@ -23,8 +23,6 @@ GetOptions(
     'conf-file=s',
     'config=s',
     'color',
-    'daemon|d',
-    'no-fork',
     'debug+',
     'delaytime=s',
     'force|f',
@@ -38,15 +36,11 @@ GetOptions(
     'logfile=s',
     'logfile-maxsize=i',
     'no-category=s',
-    'no-httpd',
     'no-ssl-check',
     'no-task=s',
     'no-p2p',
     'password|p=s',
     'proxy|P=s',
-    'httpd-ip=s',
-    'httpd-port=s',
-    'httpd-trust=s',
     'scan-homedirs',
     'server|s=s',
     'tag|t=s',
@@ -150,12 +144,6 @@ B<fusioninventory-agent> [options] [--server server|--local path]
     --no-ssl-check      do not check server SSL certificates (false)
     --timeout           connection timeout (180)
 
-  Web interface options
-    --no-httpd                 disable embedded web server (false)
-    --httpd-ip=IP              network interface to listen to
-    --httpd-port=PORT          network port to listen to (62354)
-    --httpd-trust=RANGE        trust requests from range without authentication token (false)
-
   Logging options
     --logger=BACKEND            logger backend [Stderr|File|Syslog] (Stderr)
     --logfile=FILE              log file
@@ -169,8 +157,6 @@ B<fusioninventory-agent> [options] [--server server|--local path]
 
   Execution mode options
     -w --wait=DURATION          maximum delay before execution, in seconds
-    -d --daemon                 run the agent as a daemon (false)
-    --no-fork                   don't fork in background (false)
     --debug                     debug mode (false)
     --version                   print the version and exit
 
diff --git a/fusioninventory-daemon b/fusioninventory-daemon
new file mode 100755
index 0000000000..2a117ff9f8
--- /dev/null
+++ b/fusioninventory-daemon
@@ -0,0 +1,453 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use lib './lib';
+
+use English qw(-no_match_vars);
+use Getopt::Long;
+use Pod::Usage;
+use Proc::Daemon;
+
+use FusionInventory::Agent;
+
+Getopt::Long::Configure( "no_ignorecase" );
+
+my $options = {};
+
+GetOptions(
+    $options,
+    'additional-content=s',
+    'backend-collect-timeout=s',
+    'ca-cert-dir=s',
+    'ca-cert-file=s',
+    'conf-file=s',
+    'config=s',
+    'color',
+    'no-fork',
+    'debug+',
+    'delaytime=s',
+    'force|f',
+    'help|h',
+    'html',
+    'lazy',
+    'local|l=s',
+    'logger=s',
+    'logfile=s',
+    'logfile-maxsize=i',
+    'no-category=s',
+    'no-httpd',
+    'no-ssl-check',
+    'no-task=s',
+    'no-p2p',
+    'password|p=s',
+    'proxy|P=s',
+    'httpd-ip=s',
+    'httpd-port=s',
+    'httpd-trust=s',
+    'scan-homedirs',
+    'server|s=s',
+    'tag|t=s',
+    'timeout=i',
+    'user|u=s',
+) or pod2usage(-verbose => 0);
+
+pod2usage(-verbose => 0) if $options->{help};
+
+Proc::PID::File->require();
+if (!$EVAL_ERROR) {
+    if (Proc::PID::File->running()) {
+        print STDERR "An agent is already runnnig, exiting...";
+        exit 1;
+    }
+}
+
+my $agent = FusionInventory::Agent->new(
+    confdir => './etc',
+    datadir => './share',
+    libdir  => './lib',
+    vardir  => './var',
+);
+
+eval {
+    $agent->init(options => { daemon => 1, %$options });
+    Proc::Daemon::Init() if !$options->{'no-fork'};
+    $agent->startHTTPServer();
+    $agent->run();
+};
+
+if ($EVAL_ERROR) {
+    print STDERR "Execution failure:.\n";
+    print STDERR $EVAL_ERROR;
+    exit 1;
+}
+
+exit(0);
+
+__END__
+
+=head1 NAME
+
+fusioninventory-daemon - FusionInventory agent For Linux/UNIX, Windows and MacOSX
+
+=head1 SYNOPSIS
+
+B<fusioninventory-daemon> [options] [--server server|--local path]
+
+  Target definition options
+    -s --server=URI     send tasks result to a server
+    -l --local=PATH     write tasks results locally
+
+  Target scheduling options
+    --delaytime=DURATION        maximum initial delay before first target, in seconds (3600)
+    --lazy                      do not contact the target before next scheduled time
+
+  Task selection options
+    --list-tasks        list available tasks and exit
+    --no-task=TASK      do not run given task
+
+  Inventory task specific options
+    --no-category=CATEGORY do not list given category items
+    --scan-homedirs     allow to scan use home directories (false)
+    --html              save the inventory as HTML (false)
+    -f --force          always send data to server (false)
+    -t --tag=TAG        mark the machine with given tag
+    --backend-collect-timeout   timeout for inventory modules execution (30)
+    --additional-content=FILE   additional inventory content
+
+  Package deployment task specific options
+    --no-p2p            do not use peer to peer to download files (false)
+
+  Network options:
+    -P --proxy=PROXY    proxy address
+    -u --user=USER      user name for server authentication
+    -p --password=PWD   password for server authentication
+    --ca-cert-dir=D     path to the CA certificates directory
+    --ca-cert-file=F    path to the CA certificates file
+    --no-ssl-check      do not check server SSL certificates (false)
+    --timeout           connection timeout (180)
+
+  Web interface options
+    --no-httpd                 disable embedded web server (false)
+    --httpd-ip=IP              network interface to listen to
+    --httpd-port=PORT          network port to listen to (62354)
+    --httpd-trust=RANGE        trust requests from range without authentication token (false)
+
+  Logging options
+    --logger=BACKEND            logger backend [Stderr|File|Syslog] (Stderr)
+    --logfile=FILE              log file
+    --logfile-maxsize=X         maximum size of the log file in MB (0)
+    --logfacility=FACILITY      syslog facility (LOG_USER)
+    --color                     use color in the console (false)
+
+  Configuration options
+    --config=BACKEND            configuration backend [file|registry|none]
+    --conf-file=FILE            configuration file
+
+  Execution mode options
+    -w --wait=DURATION          maximum delay before execution, in seconds
+    --no-fork                   don't fork in background (false)
+    --debug                     debug mode (false)
+    --version                   print the version and exit
+
+=head1 DESCRIPTION
+
+The F<FusionInventory> agent is a generic multi-platform agent. It can
+perform a large array of management tasks, such as local inventory, software
+deployment or network discovery. It can be used either standalone, or in
+combination with a compatible server (OCS, GLPI, OTRS) acting as a centralized
+control point.
+
+=head1 OPTIONS
+
+Most of the options are available in a I<short> form and a I<long> form.  For
+example, the two lines below are all equivalent:
+
+    % fusioninventory-daemon -s localhost
+    % fusioninventory-daemon --server localhost
+
+=head2 Target definition options
+
+=over
+
+=item B<-s>, B<--server>=I<URI>
+
+Send the results of tasks execution to given server.
+
+If I<URI> doesn't start with http:// or https://, the agent assume the
+parameter is a hostname and rewrite it as:
+
+    % --server=http://servername/ocsinventory
+
+In general, OCS Inventory server URL have this format:
+
+    http://servername/ocsinventory
+
+and FusionInventory for GLPI this one:
+
+    http://servername/glpi/plugins/fusioninventory/front/plugin_fusioninventory.communication.php
+
+Multiple values can be specified, using comma as a separator.
+
+=item B<-l>, B<--local>=I<PATH>
+
+Write the results of tasks execution locally.
+
+Exact behaviour according to given path:
+
+=over
+
+=item *
+
+if I<PATH> is a directory, a file will be created therein
+
+=item *
+
+if I<PATH> is a file, it will be used directly
+
+=item *
+
+if I<PATH> is '-', STDOUT will be used
+
+=back
+
+Multiple values can be specified, using comma as a separator.
+
+=back
+
+=head2 Target scheduling options
+
+=over
+
+=item B<--delaytime>=I<LIMIT>
+
+Set an initial delay before the first target, whose value is computed randomly
+between LIMIT / 2 and LIMIT seconds. This setting is ignored for server targets
+after the initial contact, in favor of server-specified parameter
+(PROLOG_FREQ).
+
+=item B<--lazy>
+
+Do not contact the target before next scheduled time.
+
+This option is only available when the agent is not run as a server.
+
+=back
+
+=head2 Task selection options
+
+=over
+
+=item B<--no-task>=I<TASK>
+
+Disable the given task
+
+=item B<--list-tasks>
+
+List available tasks and exit
+
+=back
+
+=head2 Inventory task specific options
+
+=over
+
+=item B<--no-category>=I<CATEGORY>
+
+Do not list given category items in inventory.
+
+=item B<--scan-homedirs>
+
+Allow the agent to scan home directories for virtual machines.
+
+=item B<--html>
+
+Save the inventory as HTML.
+
+This is only used for local inventories.
+
+=item B<-f>, B<--force>
+
+Send an inventory to the server, even if this last one doesn't ask for it.
+
+=item B<--tag>=I<TAG>
+
+Mark the machine with given tag.
+
+=item B<--backend-collect-timeout>=I<TIME>
+
+Timeout for inventory modules execution.
+
+=back
+
+=head2 Package deployment task specific options
+
+=over
+
+=item B<--no-p2p>
+
+Do not use peer to peer to download files.
+
+=back
+
+=head2 Server target specific options
+
+=over
+
+=item B<-P>, B<--proxy>=I<PROXY>
+
+Use I<PROXY> as HTTP proxy.
+
+By default, the agent uses HTTP_PROXY environment variable.
+
+=item B<-u> I<USER>, B<--user>=I<USER>
+
+Use I<USER> for server authentication.
+
+=item B<-p>, B<--password>=I<PASSWORD>
+
+Use I<PASSWORD> for server authentication.
+
+=item B<--ca-cert-dir>=I<PATH>
+
+Path to the CA certificates directory.
+
+=item B<--ca-cert-file>=I<FILE>
+
+Path to the CA certificates file.
+
+=item B<--no-ssl-check>
+
+Do not check server SSL certificates.
+
+Hint: you can set HTTPS_DEBUG environment variable to get SSL error messages in
+the console.
+
+=back
+
+=head2 Web interface options
+
+=over
+
+=item B<--no-httpd>
+
+Disable the embedded web server.
+
+=item B<--httpd-ip>=I<IP>
+
+The network interface to use for the embedded web server (all 
+available interfaces).
+
+=item B<--httpd-port>=I<PORT>
+
+The network port to use for the embedded web server (62354).
+
+=item B<--httpd-trust>=I<RANGE>
+
+Trust requests from given range without authentication token (false).
+
+=back
+
+=head2 Logging options
+
+=over
+
+=item B<--logger>=I<BACKEND>
+
+Logger backend to use. It can be:
+
+=over 4
+
+=item
+
+stderr: log messages directly in the console.
+
+=item
+
+file: log messages in a file.
+
+=item
+
+syslog: log messages through the local syslog server
+
+=back
+
+Multiple values can be specified, using comma as a separator.
+
+=item B<--logfile>=I<FILE>
+
+Log message in I<FILE> (implies File logger backend)
+
+=item B<--logfile-maxsize>=I<FILE>
+
+Max logfile size in MB, default is unlimited. When the max size is reached, the
+file is truncated. This is only useful if there is no log rotation mechanism on
+the system.
+
+=item B<--logfacility>=I<FACILITY>
+
+Syslog facility to use (default LOG_USER)
+
+=item B<--color>
+
+Display color on the terminal, when the Stderr backend is used.
+
+This options is ignored on Windows.
+
+=back
+
+=head2 Configuration options
+
+=over
+
+=item B<--conf-file>=I<FILE>
+
+Use I<FILE> as configuration file (implies file configuration backend)
+
+=item B<--config>=I<BACKEND>
+
+Configuration backend to use. It can be:
+
+=over 4
+
+=item
+
+file: read configuration from a file (default anywhere else as Windows)
+
+=item
+
+registry: read configuration from the registry (default on Windows)
+
+=item
+
+none: don't read any configuration
+
+=back
+
+=back
+
+=head2 Execution mode options
+
+=over
+
+=item B<-w> I<LIMIT>, B<--wait>=I<LIMIT>
+
+Wait a random delay whose value is computed randomly between 0 and LIMIT
+seconds, before execution. This is useful when execution is triggered from some
+kind of system scheduling on multiple clients, to spread the server load.
+
+=item B<-d>, B<--daemon>
+
+Run the agent as a daemon.
+
+=item B<--no-fork>
+
+Don't fork in background.
+
+This is only useful when running as a daemon.
+
+=item B<--debug>
+
+Turn the debug mode on.
+
+=back
diff --git a/lib/FusionInventory/Agent.pm b/lib/FusionInventory/Agent.pm
index 2af336b894..ce1ff73907 100644
--- a/lib/FusionInventory/Agent.pm
+++ b/lib/FusionInventory/Agent.pm
@@ -124,23 +124,6 @@ sub init {
         exit 1;
     }
 
-    if ($config->{daemon} && !$config->{'no-fork'}) {
-
-        $logger->debug("Time to call Proc::Daemon");
-
-        Proc::Daemon->require();
-        if ($EVAL_ERROR) {
-            $logger->error("Can't load Proc::Daemon. Is the module installed?");
-            exit 1;
-        }
-        Proc::Daemon::Init();
-        $logger->debug("Daemon started");
-        if ($self->_isAlreadyRunning()) {
-            $logger->debug("An agent is already runnnig, exiting...");
-            exit 1;
-        }
-    }
-
     # compute list of allowed tasks
     my %available = $self->getAvailableTasks(disabledTasks => $config->{'no-task'});
     my @tasks = keys %available;
@@ -152,36 +135,40 @@ sub init {
 
     $self->{tasks} = \@tasks;
 
-    # create HTTP interface
-    if (($config->{daemon} || $config->{service}) && !$config->{'no-httpd'}) {
-        FusionInventory::Agent::HTTP::Server->require();
-        if ($EVAL_ERROR) {
-            $logger->debug("Failed to load HTTP server: $EVAL_ERROR");
-        } else {
-            # make sure relevant variables are shared between threads
-            threads::shared->require();
-            # calling share(\$self->{status}) directly breaks in testing
-            # context, hence the need to use an intermediate variable
-            my $status = \$self->{status};
-            my $token = \$self->{token};
-            threads::shared::share($status);
-            threads::shared::share($token);
-
-            $_->setShared() foreach $scheduler->getTargets();
-
-            $self->{server} = FusionInventory::Agent::HTTP::Server->new(
-                logger          => $logger,
-                scheduler       => $scheduler,
-                agent           => $self,
-                htmldir         => $self->{datadir} . '/html',
-                ip              => $config->{'httpd-ip'},
-                port            => $config->{'httpd-port'},
-                trust           => $config->{'httpd-trust'},
-            );
-        }
+    $logger->debug("FusionInventory Agent initialised");
+}
+
+sub startHTTPServer {
+    my ($self) = @_;
+
+    return if $self->{config}->{'no-httpd'};
+
+    FusionInventory::Agent::HTTP::Server->require();
+    if ($EVAL_ERROR) {
+        $self->{logger}->debug("Failed to load HTTP server: $EVAL_ERROR");
+        return;
     }
 
-    $logger->debug("FusionInventory Agent initialised");
+    # make sure relevant variables are shared between threads
+    threads::shared->require();
+    # calling share(\$self->{status}) directly breaks in testing
+    # context, hence the need to use an intermediate variable
+    my $status = \$self->{status};
+    my $token = \$self->{token};
+    threads::shared::share($status);
+    threads::shared::share($token);
+
+    $_->setShared() foreach $self->{scheduler}->getTargets();
+
+    $self->{server} = FusionInventory::Agent::HTTP::Server->new(
+        logger          => $self->{logger},
+        scheduler       => $self->{scheduler},
+        agent           => $self,
+        htmldir         => $self->{datadir} . '/html',
+        ip              => $self->{config}->{'httpd-ip'},
+        port            => $self->{config}->{'httpd-port'},
+        trust           => $self->{config}->{'httpd-trust'},
+    );
 }
 
 sub run {
@@ -394,20 +381,6 @@ sub _getTaskVersion {
     return $version;
 }
 
-sub _isAlreadyRunning {
-    my ($self) = @_;
-
-    Proc::PID::File->require();
-    if ($EVAL_ERROR) {
-        $self->{logger}->debug(
-            'Proc::PID::File unavailable, unable to check for running agent'
-        );
-        return 0;
-    }
-
-    return Proc::PID::File->running();
-}
-
 sub _loadState {
     my ($self) = @_;