diff --git a/branches/experimental/app-admin/metadata.xml b/branches/experimental/app-admin/metadata.xml
new file mode 100644
index 0000000..b15417f
--- /dev/null
+++ b/branches/experimental/app-admin/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-admin category contains non-core applications which relate to
+		system administration.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-admin contiene aplicaciones para la administración
+		del sistema.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-admin enthält Applikationen zur Systemadministration,
+		die nicht Bestandteil des Basissystems sind.
+	</longdescription>
+	<longdescription lang="ja">
+		app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-admin categorie bevat applicaties met betrekking tot systeem
+		administratie.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-admin category chứa các ứng dụng liên quan
+		đến quản trị hệ thống (không tính các ứng dụng lõi).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-admin contém aplicações para a administração
+		do sistema.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-admin zawiera aplikacje dla administratorów systemu.
+	</longdescription>
+</catmetadata>
+
diff --git a/branches/experimental/net-nds/novell-ndsserv/ChangeLog b/branches/experimental/net-nds/novell-ndsserv/ChangeLog
new file mode 100644
index 0000000..4b7d50b
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/ChangeLog
@@ -0,0 +1,32 @@
+# ChangeLog for net-nds/novell-ndsserv
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  01 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsserv-8.7.3.9_p26.ebuild:
+  Gentooize ebuild
+
+  14 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsserv-8.8.1.1_p1.ebuild:
+  eDir 8.8.1 ftf ptches
+
+  10 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsserv-8.7.3.9_p22.ebuild:
+  Bump to Version 8.7.3.9
+
+  04 Nov 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsserv-8.7.3.8_p54-r1.ebuild:
+  Update ndsserv with the http hotfix
+
+  14 Aug 2006; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsserv-8.7.3.8_p54.ebuild:
+  Bump Version (Security Update)
+
+  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at>
+  novell-ndsserv-8.7.3_p37.ebuild, novell-ndsserv-8.7.3.8_p47.ebuild,
+  novell-ndsserv-8.8.1_p7.ebuild, +metadata.xml:
+  Correct Typo
+
+  13 Aug 2006; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
+  Initial ndsserv ChangeLog
+
diff --git a/branches/experimental/net-nds/novell-ndsserv/files/80novell-edir b/branches/experimental/net-nds/novell-ndsserv/files/80novell-edir
new file mode 100644
index 0000000..8c291bd
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/files/80novell-edir
@@ -0,0 +1,6 @@
+NOVELL_EDIR_DIR=/opt/novell/eDirectory
+PATH=/opt/novell/eDirectory/bin
+ROOTPATH=/opt/novell/eDirectory/bin:/opt/novell/eDirectory/sbin
+MANPATH=/opt/novell/eDirectory/man
+LDPATH=/opt/novell/eDirectory/lib
+PRELINK_PATH_MASK=/opt/novell/eDirectory/lib:/opt/novell/eDirectory/bin:/opt/novell/eDirectory/sbin
\ No newline at end of file
diff --git a/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.confd b/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.confd
new file mode 100644
index 0000000..790578f
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.confd
@@ -0,0 +1,3 @@
+
+NDSD_OPTS=""
+NDSD_CONFIGFILE="/etc/opt/novell/eDirectory/nds.conf"
diff --git a/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.initd b/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.initd
new file mode 100755
index 0000000..5c6fa83
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/files/ndsd88.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+
+depend() {
+  need net
+  after slpuasa slpd
+}
+
+checkconfig() {
+  if [ ! -e ${NDSD_CONFIGFILE} ] ; then
+     eerror "Novell eDirectory server has not been configured."
+     return 1
+  fi
+}
+
+start() {
+  ebegin "Starting Novell eDirectory server"
+  start-stop-daemon --start --quiet --exec /opt/novell/eDirectory/sbin/ndsd \
+                    --pidfile /var/nds/ndsd.pid -- ${NDSD_OPTS} -f ${NDSD_CONFIGFILE}
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping Novell eDirectory server"
+  start-stop-daemon --stop --quiet --signal INT --retry 30 --pidfile /var/nds/ndsd.pid
+  eend $?
+  if [ -f /var/nds/ndsd.pid ]; then
+    ebegin "WARNING: ndsd process is still running. Killing Novell eDirectory server"
+    echo "WARNING: ndsd process is still running. Killing ndsd." >> /var/nds/ndsd.log
+    start-stop-daemon --stop --quiet --signal KILL --pidfile /var/nds/ndsd.pid
+    rm /var/nds/ndsd.pid
+    eend $?
+   fi
+}
+
+#restart() {
+#  (Commands necessary to restart the service)
+#}
\ No newline at end of file
diff --git a/branches/experimental/net-nds/novell-ndsserv/metadata.xml b/branches/experimental/net-nds/novell-ndsserv/metadata.xml
new file mode 100644
index 0000000..7e32869
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>
diff --git a/branches/experimental/net-nds/novell-ndsserv/novell-ndsserv-8.8.1.1_p1.ebuild b/branches/experimental/net-nds/novell-ndsserv/novell-ndsserv-8.8.1.1_p1.ebuild
new file mode 100644
index 0000000..973d56d
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/novell-ndsserv-8.8.1.1_p1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Novell NDS Server and Utilities"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="http://supportfiles.novell.com/support/pub/updates/edir881ftf_1.tgz"
+
+LICENSE="Novell-eDir-88"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+
+RDEPEND="virtual/libc
+	>=app-crypt/novell-nici-2.7.0_p002
+	>=net-misc/novell-ntls-2.0.0.0_p050810
+	>=net-nds/novell-ndsbase-8.8.1_p7
+	>=net-nds/novell-novllmgnt-8.8.1_p7
+	>=sys-libs/ncurses-5.0
+	sys-libs/libstdc++-v3
+	sys-devel/gcc"
+
+RESTRICT="nomirror nostrip"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack ${WORKDIR}/881ftf1/linux/novell-NDSserv-${MY_PV}.i386.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	mv "${WORKDIR}/${PN}-${MY_PV}"/etc "${D}"/ || die "mv etc"
+	mv "${WORKDIR}/${PN}-${MY_PV}"/opt "${D}"/ || die "mv opt"
+
+	insinto /etc/env.d
+	doins "${FILESDIR}"/80novell-edir
+        insinto /etc/conf.d
+        newins ${FILESDIR}/ndsd88.confd ndsd
+        exeinto /etc/init.d
+        newexe ${FILESDIR}/ndsd88.initd ndsd
+        exeinto /etc/init.d
+        newexe ${FILESDIR}/nldap88.initd nldap
+
+	keepdir /var/opt/novell/eDirectory
+}
+
+pkg_postinst(){
+        /opt/novell/eDirectory/bin/ether
+}