diff --git a/net-analyzer/centreon/Manifest b/net-analyzer/centreon/Manifest
index 5247192f94583760fc65106fe5183784daf38731..56082d8e5f0d230194d4ca4f79ea8af0a08bcc04 100644
--- a/net-analyzer/centreon/Manifest
+++ b/net-analyzer/centreon/Manifest
@@ -3,4 +3,5 @@ AUX centreon-2.cron 515 SHA256 5f98cdd79d824abc2b010d1d6bde795d743f002faeb1e26f0
 AUX centreon.initd 1066 SHA256 eb8da2f57d9510607c4baf7f6c20a93e2c84bd854f6f2c3e62eeb37917787ddd SHA512 4c55f7817f035e40e89dbc20dc47aa86a4e1fbc55c4a014e1c96f4df4a1c005d75ae1a94ec9ab7b7ac79c674916679f6a4cd273ca1d00e50f6269b296c0a630b WHIRLPOOL e96d02e8916901419e6370ece46ab629c23cd6b04dc9d408a032b1eabfea1643c7058a88f773efe1c5e3a2d59b5afb6175a30228cc68d035442aa43a207c3ec0
 AUX initial-installconf.php 3059 SHA256 2a14afb060567ea9c15cbb0ee3a726d53369d2c3ad83cc2ed6bba96b2c9e3004 SHA512 470b29c9f7ef47407baa4fc2e48721bd7f56d6d947c358473ab79bd14bf7c9b8aadcb43e6cc0f16eba40dd7cab996c8cf57661d5016e1d658c33b80e255c6958 WHIRLPOOL f4ab695d59abfb91b3c442fe021b55b46ca1b2d7473a43571e54255f2d871348e8e6027fd3d96baaa927a0732e82df88126e054fcad33c67bc4c75ddffe7e07c
 DIST centreon-2.3.9.tar.gz 7543683 SHA256 3efc725be54101c1abda4925b7fbd28af1974ddd506e9bf3a488dfe2987009d2 SHA512 440d9430a18713ccb0e045a7711b85bd51c1c8a69b93fa65d5ddf5969c88a3b83030e6ecba14f49134ccd37588a1a3b48b0b13b7c6e748b1f01676da3fafbdd4 WHIRLPOOL 1ad3e91c72be7985cc87f5d8117611472fe48c7d32629e045718819335af4a12bd9bec639f47905254633e956b15ca658777acc33cb26ee65468c74d912ee286
+EBUILD centreon-2.3.9-r1.ebuild 8304 SHA256 c44bfc95535acae81f4b3839e98a37146abb75dcbd165d53f2277f59af45eb44 SHA512 050c1246479758aff987cd6f3fb60275287ddd3d332948325893c5bb94b84fb40cc81322fe9abecc55b83856169a282ef3a9334ffb3fba19ca32804c9d721fe5 WHIRLPOOL 2020862e53951a7483dc561ce8d25f87bba8d74edad54cec38b8bae78740e7cc71eb2beae8f30bb8f4934a2104e707e8fe44580ce4dbd078d7dbc26a56a4a7cb
 EBUILD centreon-2.3.9.ebuild 8278 SHA256 31309a2a7e710aa26244920c5a7f6fc33827e629251c3d779ea072552962937f SHA512 847e1473854e1082ce00a154b12f52d500837e11fe2e1b3398b23a9c59cf891eb35c55f29068b22cbc44758eaa839bd857c786f6af00f90cc9695b4e255dc47e WHIRLPOOL aae17ba47d1ebb084a191f368e09cec825c9808792fe5306a6fd8fd6d64f978b4f4a8dade1a0773d769082ce287324d5bfdbd9f2ae5ffc8c9cd14dfdc4da1b82
diff --git a/net-analyzer/centreon/centreon-2.3.9-r1.ebuild b/net-analyzer/centreon/centreon-2.3.9-r1.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..bee607a1d1f4351f66b07618d1571e0161835be7
--- /dev/null
+++ b/net-analyzer/centreon/centreon-2.3.9-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/centreon/centreon-1.4.2.4.ebuild,v 1.3 2008/04/03 08:30:17 hollow Exp $
+EAPI=2
+
+inherit depend.apache depend.php
+
+DESCRIPTION="Centreon is a monitoring web-frontend based on the nagios monitoring engine"
+HOMEPAGE="http://www.centreon.org"
+SRC_URI="http://download.centreon.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap xmlwriter"
+
+#version 1 cannot be upgraded
+DEPEND="!<net-analyzer/centreon-2"
+
+RDEPEND="
+	>=net-analyzer/nagios-3
+	net-analyzer/rrdtool[perl]
+	net-analyzer/net-snmp[perl]
+	net-analyzer/snmptt
+	net-analyzer/ndoutils
+	app-admin/sudo
+	>=dev-lang/php-5[xmlwriter?,mysql,ldap?,posix,snmp,soap,truetype]
+	>=dev-php/PEAR-PEAR-1.8.1
+	dev-php/smarty
+	dev-php/PEAR-Archive_Tar
+	dev-php/PEAR-Archive_Zip
+	dev-php/PEAR-Console_Getopt
+	>=dev-php/PEAR-DB-1.7.6
+	>=dev-php/PEAR-DB_DataObject_FormBuilder-1.0.0_rc4
+	>=dev-php/PEAR-Date-1.4.6
+	>=dev-php/PEAR-HTML_QuickForm_advmultiselect-1.1.0
+	>=dev-php/PEAR-HTML_Table-1.6.1
+	>=dev-php/PEAR-MDB2-2.0.0
+	>=dev-php/PEAR-Net_Ping-2.4.1
+	>=dev-php/PEAR-Net_Traceroute-0.21
+	>=dev-php/PEAR-SOAP-0.10.1
+	>=dev-php/PEAR-Validate-0.6.2
+	dev-perl/Config-IniFiles
+	dev-perl/Crypt-DES
+	dev-perl/DBI
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/GD
+	dev-perl/IO-Socket-INET6
+	dev-perl/Net-SNMP
+	dev-perl/Socket6"
+
+need_apache2
+need_php5
+
+setup_vars() {
+	INSTALL_DIR_OREON="/usr/share/centreon"
+	INSTALL_DIR_CENTREON="/usr/share/centreon"
+	OREON_PATH=${INSTALL_DIR_OREON}
+	CENTREON_ETC="/etc/centreon"
+	CENTREON_VARLIB="/var/lib/centreon"
+	VARLIB_CENTERON=${CENTERON_VARLIB}
+	CENTREON_LOG="/var/log/centreon"
+	CENTREON_PATH=${OREON_PATH}
+	CENTREON_RUNDIR="/var/run/centreon"
+	CENTREON_GENDIR="/var/cache/centreon"
+	CENTSTORAGE_RRD="${CENTREON_GENDIR}/rrd"
+	CENTSTORAGE_LIB="${CENTREON_RRD}"
+	CENTPLUGINS_TMP="${CENTREON_GENDIR}/tmp"
+	CENTPLUGINSTRAPS_BINDIR="/usr/sbin"
+
+	INSTALL_DIR_NAGIOS="/usr/share/nagios"
+	NAGIOS_ETC="/etc/nagios"
+	NAGIOS_VAR="/var/nagios"
+	NAGIOS_BIN="/usr/sbin"
+	NAGIOS_BINARY="${NAGIOS_BIN}/nagios"
+	NAGIOSTATS_BINARY="${NAGIOS_BINARY}tats"
+	NAGIOS_PLUGINS="/usr/lib/nagios/plugins"
+	NAGIOS_PLUGIN=${NAGIOS_PLUGINS}
+	NAGIOS_IMG="${INSTALL_DIR_NAGIOS}/htdocs/images"
+	NAGIOS_INIT_SCRIPT="/etc/init.d/nagios"
+	NAGIOS_USER="nagios"
+	NAGIOS_GROUP="nagios"
+
+	NDOMOD_BINARY="/usr/bin/ndomod-3x.o"
+	BIN_RRDTOOL="/usr/bin/rrdtool"
+	BIN_MAIL="/bin/mail"
+	BIN_SSH="/usr/bin/ssh"
+	BIN_SCP="/usr/bin/scp"
+	MAILER="/bin/mail"
+}
+
+pkg_setup() {
+	require_php_sapi_from apache2 cli
+	require_gd
+
+	setup_vars
+}
+
+varsubst() {
+	local path=$1
+
+	for var in "$@"; do
+		sed -i -e "s:@${var}@:$(eval echo \$${var}):g" "${D}${path}"
+	done
+}
+
+install_centreon() {
+	cd "${S}"
+
+	# copy www and doc files
+	insinto "${OREON_PATH}"
+	doins -r www
+	dosym /usr/share/nagios/htdocs/docs "${OREON_PATH}"/doc
+
+	# sanitize file modes
+	find "${D}${OREON_PATH}" -type d -exec chmod 755 {} \;
+	find "${D}${OREON_PATH}" -type f -exec chmod 644 {} \;
+
+	# keep important directories
+	keepdir "${OREON_PATH}"/www/modules
+	keepdir /var/log/centreon
+	keepdir /var/cache/centreon/rrd
+	keepdir /var/cache/centreon/smarty/{cache,config,compile}
+	keepdir /var/cache/centreon/generate/{nagiosCFG,osm}
+	keepdir /var/cache/centreon/tmp
+	keepdir /var/cache/centreon/upload/nagiosCFG
+	dosym /var/cache/centreon/generate /var/cache/centreon/filesGeneration
+
+	# prepare SQL files
+	varsubst "${OREON_PATH}"/www/install/insertBaseConf.sql \
+		NAGIOS_{USER,GROUP,ETC,BIN,VAR,PLUGIN,PLUGINS,IMG,BINARY,INIT_SCRIPT} \
+		INSTALL_DIR_NAGIOS INSTALL_DIR_{OREON,CENTREON} \
+		BIN_RRDTOOL BIN_MAIL MAILER NDOMOD_BINARY NAGIOSTATS_BINARY
+
+	varsubst "${OREON_PATH}"/www/install/createTablesCentstorage.sql \
+		NAGIOS_VAR CENTSTORAGE_RRD
+
+	# fix paths in php files
+	varsubst "${OREON_PATH}"/www/include/configuration/configCGI/formCGI.php \
+		NAGIOS_ETC INSTALL_DIR_NAGIOS
+
+	varsubst "${OREON_PATH}"/www/include/options/oreon/upGrade/preUpdate.php \
+		OREON_PATH
+        for i in $(find www/ -type f); do
+                varsubst "${OREON_PATH}"/${i} CENTREON_{ETC,VARLIB,GENDIR,LOG} \
+			MAILER CENTPLUGINSTRAPS_BINDIR
+        done
+
+	# fix preinstalled smarty
+	sed -i "s:\.\./GPL_LIB/Smarty/libs/:Smarty/:" \
+		"${D}${OREON_PATH}/www/header.php"
+	sed -i "s:\(\(../\)\+\|$centreon_path/\)GPL_LIB/SmartyCache:/var/cache/centreon/smarty:" \
+                  "${D}${OREON_PATH}/www/include/common/common-Func.php"
+	sed -i "s:$centreon_path . 'GPL_LIB/Smarty/libs/':'Smarty/':" \
+		"${D}${OREON_PATH}/www/include/monitoring/external_cmd/popup/popup.php"
+
+
+	# install apache config
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/99_centreon.conf
+
+	# install global installation config
+	insinto "${OREON_PATH}"/www/install
+	newins "${FILESDIR}"/initial-installconf.php install.conf.php
+
+	# set permissions
+	fowners -R apache:apache \
+		/var/cache/centreon \
+		"${OREON_PATH}"/www
+
+	fowners -R nagios:apache \
+		/var/log/centreon
+}
+
+install_plugins() {
+	cd "${S}"
+
+	# install plugin configuration
+	insinto /etc/centreon
+	doins ./plugins/src/centreon.conf
+	rm -f ./plugins/src/centreon.conf
+	dosym "${NAGIOS_PLUGINS}/centreon.conf" /etc/centreon/centreon.conf
+
+	varsubst /etc/centreon/centreon.conf \
+		INSTALL_DIR_NAGIOS INSTALL_DIR_OREON \
+		NAGIOS_ETC NAGIOS_PLUGINS
+
+	fowners -R apache:apache \
+		/etc/centreon
+
+	# install nagios plugins
+	exeinto "${NAGIOS_PLUGINS}"
+
+	for plugin in ./plugins/src/*; do
+		if [[ ! -d "${plugin}" ]]; then
+			doexe "${plugin}"
+			varsubst "${NAGIOS_PLUGINS}/$(basename "${plugin}")" \
+				NAGIOS_PLUGINS NAGIOS_VAR CENTREON_ETC \
+				CENTPLUGINS_TMP
+		fi
+	done
+}
+
+install_traps() {
+	cd "${S}"
+
+	# install snmp traps plugins
+	dodir "${NAGIOS_PLUGINS}"/traps
+	dodir /etc/snmp/centreon
+	dosym /etc/snmp/centreon /etc/snmp/centreon_traps
+
+	# install snmp configs
+	insinto /etc/snmp/centreon
+	doins plugins/src/traps/conf/snmptt.ini
+	fowners -R apache:nagios /etc/snmp/centreon
+
+	insinto /etc/snmp/
+	doins plugins/src/traps/conf/snmp.conf
+	doins plugins/src/traps/conf/snmptrapd.conf
+}
+
+install_daemons() {
+	cd "${S}"
+
+	# install daemon
+	insinto /usr
+	dosbin bin/*
+	for i in $(find bin/ -type f); do
+	        varsubst /usr/sbin/$(basename "${i}") \
+			CENTREON_{LOG,PATH,RUNDIR,ETC,VARLIB,DIR} \
+			NAGIOS_{USER,GROUP} BIN_{SSH,SCP} CENTPLUGINS_TMP \
+			CENTSTORAGE_LIB
+        done
+	# install daemon library files
+	insinto /usr/share/centreon/lib
+	doins lib/*
+
+	# install init script
+	newinitd "${FILESDIR}"/centreon.initd centreon
+
+	# keep important directories
+	keepdir /etc/centreon
+	keepdir /var/run/centreon
+	keepdir /var/log/centreon
+	keepdir /var/lib/centreon
+	keepdir /var/lib/centreon/database
+
+	# set permissions
+	fowners -R nagios:nagios \
+		/var/run/centreon \
+		/var/log/centreon \
+		/var/lib/centreon/database
+}
+
+install_cron() {
+	cd "${S}"
+
+	insinto "${OREON_PATH}"
+	doins -r cron
+
+	fperms +x "${OREON_PATH}"/cron/*
+
+	for i in $(find cron/ -type f); do
+		varsubst "${OREON_PATH}"/${i} \
+			CENTREON_{PATH,ETC,VARLIB,LOG,RUNDIR} \
+			VARLIB_CENTREON
+	done
+
+	insinto /etc/cron.d
+	newins "${FILESDIR}"/centreon-2.cron centreon
+}
+
+src_install() {
+	install_centreon
+	install_plugins
+	install_traps
+	install_daemons
+	install_cron
+}
+
+pkg_config() {
+	setup_vars
+
+	einfo "Setting permissions on ${ROOT}${NAGIOS_ETC}"
+	chown nagios:apache "${ROOT}${NAGIOS_ETC}"
+	chmod 0775 "${ROOT}${NAGIOS_ETC}"
+
+	einfo "Setting permissions on ${ROOT}${NAGIOS_PLUGINS}"
+	chown nagios:apache "${ROOT}${NAGIOS_PLUGINS}"
+	chmod 0775 "${ROOT}${NAGIOS_PLUGINS}"
+
+	einfo "Setting permissions on ${ROOT}${NAGIOS_PLUGINS}/contrib"
+	chown nagios:apache "${ROOT}${NAGIOS_PLUGINS}"/contrib
+	chmod 0775 "${ROOT}${NAGIOS_PLUGINS}"/contrib
+
+	einfo "Adding user apache to group nagios"
+	usermod -a -G nagios apache
+
+	SUDOERS="${ROOT}etc/sudoers"
+
+	if ! grep -q CENTREON "${SUDOERS}"; then
+		einfo "Adding sudo configuration"
+		echo >> "${SUDOERS}"
+		echo "# centreon configuration" >> "${SUDOERS}"
+		echo "User_Alias  CENTREON=apache" >> "${SUDOERS}"
+		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/nagios restart" >> "${SUDOERS}"
+		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/nagios reload"  >> "${SUDOERS}"
+		echo "CENTREON    ALL = NOPASSWD: /etc/init.d/snmptrapd restart" >> "${SUDOERS}"
+	fi
+}
diff --git a/net-analyzer/centreon/files/centreon-2.cron b/net-analyzer/centreon/files/centreon-2.cron
index 03c07638d1178f59423226703c106a4dc27b3c47..bb7b8557f9ba3a9bd71fb6f2be70597cf5783f01 100644
--- a/net-analyzer/centreon/files/centreon-2.cron
+++ b/net-analyzer/centreon/files/centreon-2.cron
@@ -2,7 +2,7 @@ OREON_DIR=/usr/share/centreon
 LOG_DIR=/var/log/centreon
 
 */2 * * * *    nagios /usr/bin/php -q ${OREON_DIR}/cron/centAcl.php 2>&1 >> ${LOG_DIR}/centAcl.log
-0 1 1-31 * * nagios /usr/bin/perl ${OREON_DIR}/cron/archiveDayLog 2>&1 >> ${LOG_DIR}/archiveDayLog.log
+#0 1 1-31 * * nagios /usr/bin/perl ${OREON_DIR}/cron/archiveDayLog 2>&1 >> ${LOG_DIR}/archiveDayLog.log
 * * * * *    nagios /usr/sbin/logAnalyser 2>&1 >> ${LOG_DIR}/logAnalyser.log
 */5 * * * *    nagios /usr/sbin/nagiosPerfTrace 2>&1 >> ${LOG_DIR}/nagiosPerfTrace.log
 0 2 * * *    nagios ${OREON_DIR}/cron/centreonPurge.sh 2>&1 >> ${LOG_DIR}/centreonPurge.log
diff --git a/net-analyzer/centreon/files/centreon.initd b/net-analyzer/centreon/files/centreon.initd
index 15d63de93389ebcd6b941cde249ab23fc9d22843..22a17ed8b3f86192ea6cde33fde17260e5a408d7 100644
--- a/net-analyzer/centreon/files/centreon.initd
+++ b/net-analyzer/centreon/files/centreon.initd
@@ -9,14 +9,18 @@ depend() {
 
 start() {
 	ebegin "Starting CentCore"
-	start-stop-daemon --start --pidfile /var/run/centreon/centcore.pid \
+    if [ ! -e /run/centreon ]; then
+		mkdir /run/centreon
+		chown nagios:nagios /run/centreon
+	fi
+	start-stop-daemon --start --pidfile /run/centreon/centcore.pid \
 		--user nagios --chuid nagios \
 		--group nagios \
 		--startas /usr/sbin/centcore -- \
 		>> /var/log/centreon/centcore.log 2>&1
 	eend
         ebegin "Starting CentStorage Collector"
-        start-stop-daemon --start --pidfile /var/run/centreon/centstorage.pid \
+        start-stop-daemon --start --pidfile /run/centreon/centstorage.pid \
                 --user nagios --chuid nagios \
                 --group nagios \
 		--startas /usr/sbin/centstorage -- \
@@ -26,9 +30,9 @@ start() {
 
 stop() {
 	ebegin "Stopping CentStorage Collector"
-	start-stop-daemon  --stop --pidfile /var/run/centreon/centstorage.pid
+	start-stop-daemon  --stop --pidfile /run/centreon/centstorage.pid
 	eend
         ebegin "Stopping CentCore"
-        start-stop-daemon  --stop --pidfile /var/run/centreon/centcore.pid
+        start-stop-daemon  --stop --pidfile /run/centreon/centcore.pid
         eend
 }