diff --git a/net-analyzer/shinken/Manifest b/net-analyzer/shinken/Manifest
index f3ca8ee..8af87ad 100644
--- a/net-analyzer/shinken/Manifest
+++ b/net-analyzer/shinken/Manifest
@@ -2,4 +2,4 @@ AUX shinken-0.6.5.patch 4010 RMD160 8745a2ee5b4518b057435b5b9fd4ebe178fdbfa4 SHA
 AUX shinken.confd 2041 RMD160 618a2fa8ba16c052445d23f136a6ac7b685e89bb SHA1 22c2eb50379cb604055bef76cdfc443d7514436a SHA256 512d72af135fb74678f0ad42c5cd8d5125de3c77c2adcba7317c3fed316db6f3
 AUX shinken.initd 1032 RMD160 5b54862ad20a0a99f4f06cf25f0b192220d9f949 SHA1 1e49b43e1041da45535b577882036341f8d4b39f SHA256 0c60299d88218ec8f7c6937c93fa84fc6f72cb498d0b85ead80fcf9bfc793579
 DIST shinken-0.6.5.tar.gz 5155015 RMD160 73d3646d092aa0d92474b31257b8c73c252dbc19 SHA1 62ee08fb290570484cb50979ed75791cd83a6a18 SHA256 ff08fb8a9ec669732316d3b2bd4423572efc2123482cbb8128b71c08aad64deb
-EBUILD shinken-0.6.5.ebuild 1522 RMD160 7d5e19d269835a33d560f57db538c681807f0316 SHA1 2d8121e9a46a3d7723d6685e40aca489bdca8f66 SHA256 d17731fcfc116998c3e8a217ba257b833d83329648cc14d2bd2cf782d917a0a9
+EBUILD shinken-0.6.5.ebuild 1805 RMD160 d1d49126a5d0f4476d66cf464ae5c176848855a0 SHA1 459755dfc403a38569eee1dade32b865cf4145c3 SHA256 7f9175614018fe7a5018a8c12f21a689417dc38f5c0b33212835bdd19f4a94d8
diff --git a/net-analyzer/shinken/shinken-0.6.5.ebuild b/net-analyzer/shinken/shinken-0.6.5.ebuild
index c35ce1b..993fa78 100644
--- a/net-analyzer/shinken/shinken-0.6.5.ebuild
+++ b/net-analyzer/shinken/shinken-0.6.5.ebuild
@@ -25,7 +25,8 @@ RDEPEND="
 	livestat? ( dev-python/simplejson
 		dev-python/pysqlite )
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	!net-analyzer/nagios"
 
 SHINKENMODULES="scheduler poller reactionner broker arbiter"
 
@@ -55,7 +56,15 @@ src_install() {
 	keepdir /var/lib/${PN}
 	fowners shinken:shinken "/var/lib/${PN}"
 	fperms 750 "/var/lib/${PN}"
-	keepdir /var/run/${PN}
+	keepdir "/var/run/${PN}"
+	insinto "/usr/lib/nagios/plugins"
+	doins libexec/*.sh libexec/*.py
+	dobin bin/nagios
+	manpages="scheduler receiver reactionner poller discovery broker arbiter"
+	for mod in $manpages; do
+		newman for_debian/man/shinken-${mod}.8shinken shinken-${mod}.8
+	done
+
 	newconfd ${FILESDIR}/${PN}.confd ${PN}
 	newinitd ${FILESDIR}/${PN}.initd ${PN}
 	cd ${D}/etc/init.d