diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog b/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
index ab6d4eac..fa749282 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
+  -novell-nldapbase-8.7.3.10_p56.ebuild,
+  +novell-nldapbase-8.7.3.10_p56-r1.ebuild:
+  rename man pages prefix them with novell-* so thy dont collide with
+  openldap
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   -novell-nldapbase-8.7.3.9_p54-r1.ebuild,
   +novell-nldapbase-8.7.3.10_p56.ebuild:
diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest b/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
index 063cd295..3a76460b 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/Manifest
@@ -1,5 +1,5 @@
 AUX 80novell-edir 303 RMD160 64062683170df6b99c1a4c42045a6f912ac5b6c6 SHA1 b37717d66ba1fd03e6d4896269a3e53b6f2c09ea SHA256 adf68d10cf4426db1e1747250fc4a42408117435f2c63db38b49f9ac81c33242
 DIST edir87310b.tar.gz 254792877 RMD160 0b75eb50013f7c87c815a37d45786650d2f42bef SHA1 d976b29d6900a3ee9506e08abe783e4a9bf07b16 SHA256 e01297b4929c666ef2c5969b8a3098182ce96575ddf0a816a27451ece612aba6
-EBUILD novell-nldapbase-8.7.3.10_p56.ebuild 1725 RMD160 0d427dd361a237adb6b39664d1f9d875b200c11b SHA1 c4d8241ef655b15fae493d829afb92154dc8db82 SHA256 63d1d4fa5c818d1bf89bb5811ab79f469266aee55e8a31eb36bd080f56dfd30c
-MISC ChangeLog 1202 RMD160 48dc00fc7934fb25d51a424b8f7a34186a5ed232 SHA1 99c425eb7e53b772408b26862720c4512de0d8fa SHA256 baf3e85cf9bda822fb2c570cc37001a46a67c7f1bb82768434cd067579926359
+EBUILD novell-nldapbase-8.7.3.10_p56-r1.ebuild 2111 RMD160 c54494935b4bab2e2eb9b067d4485cdec74427f2 SHA1 ae5d55d4e846d4b91034f21a13265f3e408968c2 SHA256 7caf92f421f83ace5745c14cdbba82124780a3ea28157dfeb29d3fb7df8571bd
+MISC ChangeLog 1420 RMD160 c2c2db0f5535f5e9dc51edbb49b85ccfc53bba6f SHA1 32f8770651034b5847c947e629884643ad3575bd SHA256 8f3e898a10082987f306902b8a3cbd0101fa856d3be345a939b0868c768c0012
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56.ebuild b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56-r1.ebuild
similarity index 77%
rename from trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56.ebuild
rename to trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56-r1.ebuild
index 7b78a1b6..38505428 100644
--- a/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-nldapbase/novell-nldapbase-8.7.3.10_p56-r1.ebuild
@@ -38,8 +38,17 @@ src_install() {
 	dolib "${WORKDIR}"/${PN}-${MY_PV}/usr/lib/*
 	into /usr/ldaptools
 	dobin "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/bin/*
-	doman "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/*/*
-	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/fr/*/*
+	# renae conflicting man pages
+	cd "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/man1
+	for i in *
+	do
+	    mv "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/man1/${i} \
+	    "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/man1/novell-${i}
+	    mv "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/fr/man1/${i} \
+	    "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/fr/man1/novell-${i}
+	done
+	doman "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/*/*.*
+	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/usr/ldaptools/man/fr/*/*.*
 
 }