diff --git a/app-admin/netiq-ndsswan/ChangeLog b/app-admin/netiq-ndsswan/ChangeLog
index 49152c9b..572a1182 100644
--- a/app-admin/netiq-ndsswan/ChangeLog
+++ b/app-admin/netiq-ndsswan/ChangeLog
@@ -1,10 +1,52 @@
-# ChangeLog for app-admin/netiq-ndsswan
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for app-admin/novell-ndsswan
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*netiq-ndsswan-8.7.0.1-r1 (16 Aug 2014)
+  17 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-ndsswan-8.7.0.1.ebuild:
+  correct rpm_unpack warning
+
+  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  novell-ndsswan-8.7.0_p1-r5.ebuild:
+  add amd64
+
+  26 Aug 2008; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
+  Redigest
+
+  26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
+  -novell-ndsswan-8.7.0_p1-r3.ebuild, -novell-ndsswan-8.7.0_p1-r4.ebuild,
+  novell-ndsswan-8.7.0_p1-r5.ebuild:
+  Repoman cleanup & delete old
+
+  09 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsswan-8.7.0_p1-r5.ebuild:
+  correct resourceles install
+
+  01 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsswan-8.7.0_p1-r4.ebuild:
+  initial import ConsoleOne 1.3.6h
+
+  04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
+  -novell-ndsswan-8.7.0_p1.ebuild, -novell-ndsswan-8.7.0_p1-r1.ebuild,
+  -novell-ndsswan-8.7.0_p1-r2.ebuild:
+  Drop old buggy ebuild
+
+  13 Mar 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsswan-8.7.0_p1-r3.ebuild:
+  Gentooize c1 snapin
+
+  17 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsswan-8.7.0_p1-r2.ebuild:
+  Update c1 to 1.3.6f
+
+  13 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsswan-8.7.0_p1-r1.ebuild:
+  Correct Permissions for non root users
+
+  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at>
+  novell-ndsswan-8.7.0_p1.ebuild, +metadata.xml:
+  Correct Typo
+
+  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
+  Initial ndsswan ChangeLog
 
-  16 Aug 2014; Mario Fetka <mario.fetka@gmail.com> +metadata.xml,
-  +netiq-ndsswan-8.7.0.1-r1.ebuild:
-  change layout and depnd on new name and install requred 8.7 liebs to
-  consoleone libdir
diff --git a/app-admin/netiq-ndsswan/ChangeLog.txt b/app-admin/netiq-ndsswan/ChangeLog.txt
deleted file mode 100644
index 572a1182..00000000
--- a/app-admin/netiq-ndsswan/ChangeLog.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-# ChangeLog for app-admin/novell-ndsswan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  17 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-  +novell-ndsswan-8.7.0.1.ebuild:
-  correct rpm_unpack warning
-
-  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  novell-ndsswan-8.7.0_p1-r5.ebuild:
-  add amd64
-
-  26 Aug 2008; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
-  Redigest
-
-  26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
-  -novell-ndsswan-8.7.0_p1-r3.ebuild, -novell-ndsswan-8.7.0_p1-r4.ebuild,
-  novell-ndsswan-8.7.0_p1-r5.ebuild:
-  Repoman cleanup & delete old
-
-  09 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
-  +novell-ndsswan-8.7.0_p1-r5.ebuild:
-  correct resourceles install
-
-  01 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
-  +novell-ndsswan-8.7.0_p1-r4.ebuild:
-  initial import ConsoleOne 1.3.6h
-
-  04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
-  -novell-ndsswan-8.7.0_p1.ebuild, -novell-ndsswan-8.7.0_p1-r1.ebuild,
-  -novell-ndsswan-8.7.0_p1-r2.ebuild:
-  Drop old buggy ebuild
-
-  13 Mar 2007; Mario Fetka <mario-fetka@gmx.at>
-  +novell-ndsswan-8.7.0_p1-r3.ebuild:
-  Gentooize c1 snapin
-
-  17 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
-  +novell-ndsswan-8.7.0_p1-r2.ebuild:
-  Update c1 to 1.3.6f
-
-  13 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
-  +novell-ndsswan-8.7.0_p1-r1.ebuild:
-  Correct Permissions for non root users
-
-  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at>
-  novell-ndsswan-8.7.0_p1.ebuild, +metadata.xml:
-  Correct Typo
-
-  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
-  Initial ndsswan ChangeLog
-