diff --git a/net-nds/fedora-ds-base/Manifest b/net-nds/fedora-ds-base/Manifest
index b12bbaa3..48bbbb05 100644
--- a/net-nds/fedora-ds-base/Manifest
+++ b/net-nds/fedora-ds-base/Manifest
@@ -1,20 +1,20 @@
+AUX dirsrv.confd 72 RMD160 d5478a77018aeb727ba72217d3e67af3dcd669c9 SHA1 006d238cd3fd31b9019a2a1e5bff250192b05a91 SHA256 62d68e8ab4b2b1342a3418e6b067a99345a2806ec1575f6d49cd6c0d1cbb17bc
+MD5 3afe86800d3b998af3d1ef2f7eebe9dd files/dirsrv.confd 72
+RMD160 d5478a77018aeb727ba72217d3e67af3dcd669c9 files/dirsrv.confd 72
+SHA256 62d68e8ab4b2b1342a3418e6b067a99345a2806ec1575f6d49cd6c0d1cbb17bc files/dirsrv.confd 72
+AUX dirsrv.initd 2382 RMD160 9cd3beda5aa05c8db9c9146ed088b22b85c10aba SHA1 5f3555c20c889fd6466ab8a77f686aa6ccaf3ad7 SHA256 8e060936368a9e996ecdc2d46c439906fe8030819e78a8864b9444c6b4d3920d
+MD5 4cadf56f22638345c46df943f4851a29 files/dirsrv.initd 2382
+RMD160 9cd3beda5aa05c8db9c9146ed088b22b85c10aba files/dirsrv.initd 2382
+SHA256 8e060936368a9e996ecdc2d46c439906fe8030819e78a8864b9444c6b4d3920d files/dirsrv.initd 2382
 AUX fedora-ds-cvs.sh 346 RMD160 d9659f0aa8559c59865f42e16bc611a57a63d893 SHA1 8069aeee78a5fd614f19f3438c9f3dada700e944 SHA256 f2e453b1139b010ceae3dee2c0292e616a67ec55046e759b90c1104721ad412a
 MD5 4fe3a84af16b5a5c2ab1f6d0a589584a files/fedora-ds-cvs.sh 346
 RMD160 d9659f0aa8559c59865f42e16bc611a57a63d893 files/fedora-ds-cvs.sh 346
 SHA256 f2e453b1139b010ceae3dee2c0292e616a67ec55046e759b90c1104721ad412a files/fedora-ds-cvs.sh 346
-AUX fedora-ds.confd 72 RMD160 d5478a77018aeb727ba72217d3e67af3dcd669c9 SHA1 006d238cd3fd31b9019a2a1e5bff250192b05a91 SHA256 62d68e8ab4b2b1342a3418e6b067a99345a2806ec1575f6d49cd6c0d1cbb17bc
-MD5 3afe86800d3b998af3d1ef2f7eebe9dd files/fedora-ds.confd 72
-RMD160 d5478a77018aeb727ba72217d3e67af3dcd669c9 files/fedora-ds.confd 72
-SHA256 62d68e8ab4b2b1342a3418e6b067a99345a2806ec1575f6d49cd6c0d1cbb17bc files/fedora-ds.confd 72
-AUX fedora-ds.initd 2382 RMD160 9cd3beda5aa05c8db9c9146ed088b22b85c10aba SHA1 5f3555c20c889fd6466ab8a77f686aa6ccaf3ad7 SHA256 8e060936368a9e996ecdc2d46c439906fe8030819e78a8864b9444c6b4d3920d
-MD5 4cadf56f22638345c46df943f4851a29 files/fedora-ds.initd 2382
-RMD160 9cd3beda5aa05c8db9c9146ed088b22b85c10aba files/fedora-ds.initd 2382
-SHA256 8e060936368a9e996ecdc2d46c439906fe8030819e78a8864b9444c6b4d3920d files/fedora-ds.initd 2382
 DIST fedora-ds-1.1.0-pre20071006.tar.bz2 2759083 RMD160 cc2b7519d2ca75dc95e6a3d504f48098e9701162 SHA1 c01323e779e8da92ac8edc4843e6443101c22810 SHA256 d5aea3ecd8e28cc092be246b9d8c39a174873915d6bf5f3fea3cb249097eb5f8
-EBUILD fedora-ds-base-1.1.0_pre20071006.ebuild 2360 RMD160 0e6be596376e3b97736d883f3ebfda596c7eda43 SHA1 8fe7fbb9fa68fb6c344d6cb69e3a86a20024e847 SHA256 27b64f0f6d275b2efcc79276b7c3e007ae6bf86535ba729495ab2724217f4c81
-MD5 dbc4654ef4bde0a23d64279b1f62fa5d fedora-ds-base-1.1.0_pre20071006.ebuild 2360
-RMD160 0e6be596376e3b97736d883f3ebfda596c7eda43 fedora-ds-base-1.1.0_pre20071006.ebuild 2360
-SHA256 27b64f0f6d275b2efcc79276b7c3e007ae6bf86535ba729495ab2724217f4c81 fedora-ds-base-1.1.0_pre20071006.ebuild 2360
+EBUILD fedora-ds-base-1.1.0_pre20071006.ebuild 2348 RMD160 ae2757534b2c22601494015b1a4c8df90b6fa27e SHA1 4c106940b73eef5eda30dd2f73069fb89baac7a4 SHA256 cc3124534681a450d2b6eedf70c020b215a21af9aa311d98286379a274ecf877
+MD5 bcaf3e6bef25c5a3b1ca0d86dfe34d61 fedora-ds-base-1.1.0_pre20071006.ebuild 2348
+RMD160 ae2757534b2c22601494015b1a4c8df90b6fa27e fedora-ds-base-1.1.0_pre20071006.ebuild 2348
+SHA256 cc3124534681a450d2b6eedf70c020b215a21af9aa311d98286379a274ecf877 fedora-ds-base-1.1.0_pre20071006.ebuild 2348
 MISC ChangeLog 428 RMD160 48a150427fb615e22645016f58a3b03b2d7029c9 SHA1 1770f1a8ce6c7a4e791da5cd64021bee0d61bde9 SHA256 347da8826e99375fb0cae8fc87f86ee7c3915f7b2b0e5de0ac16fbef284899f0
 MD5 bd474fe4559f9c89e7bf66e201a77d13 ChangeLog 428
 RMD160 48a150427fb615e22645016f58a3b03b2d7029c9 ChangeLog 428
diff --git a/net-nds/fedora-ds-base/fedora-ds-base-1.1.0_pre20071006.ebuild b/net-nds/fedora-ds-base/fedora-ds-base-1.1.0_pre20071006.ebuild
index 12ae6bbf..a95c1428 100644
--- a/net-nds/fedora-ds-base/fedora-ds-base-1.1.0_pre20071006.ebuild
+++ b/net-nds/fedora-ds-base/fedora-ds-base-1.1.0_pre20071006.ebuild
@@ -76,8 +76,8 @@ src_install () {
 
 	# remove redhat style init script and install gentoo style
 	rm -rf ${D}/etc/rc.d
-	newinitd ${FILESDIR}/fedora-ds.initd fedora-ds
-	newconfd ${FILESDIR}/fedora-ds.confd fedora-ds
+	newinitd ${FILESDIR}/dirsrv.initd dirsrv
+	newconfd ${FILESDIR}/dirsrv.confd dirsrv
 
         # cope with libraries being in /usr/lib/fedora-ds
         dodir /etc/env.d
diff --git a/net-nds/fedora-ds-base/files/fedora-ds.confd b/net-nds/fedora-ds-base/files/dirsrv.confd
similarity index 100%
rename from net-nds/fedora-ds-base/files/fedora-ds.confd
rename to net-nds/fedora-ds-base/files/dirsrv.confd
diff --git a/net-nds/fedora-ds-base/files/fedora-ds.initd b/net-nds/fedora-ds-base/files/dirsrv.initd
similarity index 100%
rename from net-nds/fedora-ds-base/files/fedora-ds.initd
rename to net-nds/fedora-ds-base/files/dirsrv.initd
diff --git a/net-nds/fedora-ds-console/files/fedora-ds-console-cvs.sh b/net-nds/fedora-ds-console/files/fedora-ds-console-cvs.sh
deleted file mode 100755
index 715be29d..00000000
--- a/net-nds/fedora-ds-console/files/fedora-ds-console-cvs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-DATE=`date +%Y%m%d`
-CVSTAG=HEAD
-VERSION=1.1.0
-PKGNAME=fedora-ds-console
-export CVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec
-
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-pre$DATE directoryconsole
-
-tar -cjf $PKGNAME-$VERSION-pre$DATE.tar.bz2 $PKGNAME-$VERSION-pre$DATE
-
-rm -rf $PKGNAME-$VERSION-pre$DATE