diff --git a/app-admin/fedora-admin-console/Manifest b/app-admin/fedora-admin-console/Manifest
new file mode 100644
index 00000000..7e2bdfe4
--- /dev/null
+++ b/app-admin/fedora-admin-console/Manifest
@@ -0,0 +1,12 @@
+AUX fedora-admin-console-cvs.sh 348 RMD160 cdcb7c99e3bde6e2d83076a6f34226d007e97357 SHA1 17415345c1ddeb1ebc6aa0b38025755c021dfec0 SHA256 3f2335d0c7b017e4e60ac18e48f6469a46e14e01b9bcdddbdf071220e641e968
+MD5 3d990a900b3ef737aaeb2226da3176de files/fedora-admin-console-cvs.sh 348
+RMD160 cdcb7c99e3bde6e2d83076a6f34226d007e97357 files/fedora-admin-console-cvs.sh 348
+SHA256 3f2335d0c7b017e4e60ac18e48f6469a46e14e01b9bcdddbdf071220e641e968 files/fedora-admin-console-cvs.sh 348
+DIST fedora-admin-console-1.1.0-pre20071007.tar.bz2 129148 RMD160 bad94b87115b32ac39f0d276fcfd87d3fb86cdce SHA1 fa50a41c09dd8e311818586f48d2db85ac5dcbd3 SHA256 c84dac96f702005cdfe566741062fb246e60609127bac23a3833bf30c35d8886
+EBUILD fedora-admin-console-1.1.0_pre20071007.ebuild 2022 RMD160 14427bda21ba50aefa13ecb876d41c82f18958a9 SHA1 ab83ea4a4aa899200850fe893212051f1266c221 SHA256 46d3f60259d16a2f168875a82a379f4ed8d5b3156c118d3943a9abd155abc630
+MD5 befe3b394423d813779b9317a564fbf3 fedora-admin-console-1.1.0_pre20071007.ebuild 2022
+RMD160 14427bda21ba50aefa13ecb876d41c82f18958a9 fedora-admin-console-1.1.0_pre20071007.ebuild 2022
+SHA256 46d3f60259d16a2f168875a82a379f4ed8d5b3156c118d3943a9abd155abc630 fedora-admin-console-1.1.0_pre20071007.ebuild 2022
+MD5 295107783d91bfe6aa27ee3c5f79cedf files/digest-fedora-admin-console-1.1.0_pre20071007 319
+RMD160 a140a7edfe62c6514c922b0ba87a3b2d7f1ecf0a files/digest-fedora-admin-console-1.1.0_pre20071007 319
+SHA256 a36a89902ee29f878f96555230ba36f12d3bccd610fdb34116c73d5c7d16a304 files/digest-fedora-admin-console-1.1.0_pre20071007 319
diff --git a/app-admin/fedora-admin-console/fedora-admin-console-1.1.0_pre20071007.ebuild b/app-admin/fedora-admin-console/fedora-admin-console-1.1.0_pre20071007.ebuild
new file mode 100644
index 00000000..81d6f5d5
--- /dev/null
+++ b/app-admin/fedora-admin-console/fedora-admin-console-1.1.0_pre20071007.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 eutils java-ant-2 versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_V=1.1.0
+
+DESCRIPTION="Fedora Admin Server Management Console"
+HOMEPAGE="http://directory.fedoraproject.org/"
+SRC_URI="http://ftp.mars.arge.at/fedora-ds/fedora-admin-console-${MY_PV}.tar.bz2
+        ftp://mars.arge.at/fedora-ds/fedora-admin-console-${MY_PV}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc source"
+
+S="${WORKDIR}/fedora-admin-console-${MY_PV}"
+
+COMMON_DEP="=dev-java/jss-4*
+	>=dev-java/ldapsdk-4.0
+	>=dev-java/idm-console-framework-1.1"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+	
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# gentoo java rules say no jars with version number
+	# so sed away the version indicator '-'  
+	sed -e "s!-\*!\*!g" -i build.xml
+	
+	java-pkg_jarfrom ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jarfrom jss-3.4 xpclass.jar jss4.jar
+	java-pkg_jarfrom idm-console-framework-1.1
+}
+
+src_compile() {
+	eant -Dbuilt.dir=${S}/build \
+	     -Dldapjdk.location=${S} \
+	     -Djss.location=${S} \
+	     -Dconsole.location=${S} ${antflags}
+	
+	use doc && eant -Dbuilt.dir=${S}/build \
+	     -Dldapjdk.location=${S} \
+	     -Djss.location=${S} \
+	     -Dconsole.location=${S} ${antflags} javadoc
+
+}
+
+src_install() {
+	java-pkg_jarinto /usr/share/dirsrv/java
+	java-pkg_newjar ${S}/build/package/fedora-admin-${MY_V}.jar fedora-admin.jar
+	java-pkg_newjar ${S}/build/package/fedora-admin-${MY_V}_en.jar fedora-admin_en.jar
+	insinto /usr/share/dirsrv/manual/en/admin
+	doins ${S}/help/en/*.html
+	doins ${S}/help/en/tokens.map
+	insinto /usr/share/dirsrv/manual/en/admin/help
+	doins ${S}/help/en/help/*.html
+#       dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+        use doc && java-pkg_dojavadoc build/doc
+        use source && java-pkg_dosrc src/com
+
+}
diff --git a/app-admin/fedora-admin-console/files/digest-fedora-admin-console-1.1.0_pre20071007 b/app-admin/fedora-admin-console/files/digest-fedora-admin-console-1.1.0_pre20071007
new file mode 100644
index 00000000..93337eae
--- /dev/null
+++ b/app-admin/fedora-admin-console/files/digest-fedora-admin-console-1.1.0_pre20071007
@@ -0,0 +1,3 @@
+MD5 4c625801e4faa664bc665d430a5f1a55 fedora-admin-console-1.1.0-pre20071007.tar.bz2 129148
+RMD160 bad94b87115b32ac39f0d276fcfd87d3fb86cdce fedora-admin-console-1.1.0-pre20071007.tar.bz2 129148
+SHA256 c84dac96f702005cdfe566741062fb246e60609127bac23a3833bf30c35d8886 fedora-admin-console-1.1.0-pre20071007.tar.bz2 129148
diff --git a/app-admin/fedora-admin-console/files/fedora-admin-console-cvs.sh b/app-admin/fedora-admin-console/files/fedora-admin-console-cvs.sh
new file mode 100755
index 00000000..3e433d23
--- /dev/null
+++ b/app-admin/fedora-admin-console/files/fedora-admin-console-cvs.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+DATE=`date +%Y%m%d`
+CVSTAG=HEAD
+VERSION=1.1.0
+PKGNAME=fedora-admin-console
+export CVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec
+
+cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-pre$DATE admservconsole
+
+tar -cjf $PKGNAME-$VERSION-pre$DATE.tar.bz2 $PKGNAME-$VERSION-pre$DATE
+
+rm -rf $PKGNAME-$VERSION-pre$DATE
diff --git a/app-admin/fedora-ds-console/Manifest b/app-admin/fedora-ds-console/Manifest
new file mode 100644
index 00000000..a6de3f53
--- /dev/null
+++ b/app-admin/fedora-ds-console/Manifest
@@ -0,0 +1,12 @@
+AUX fedora-ds-console-cvs.sh 347 RMD160 69a9fa2f78e67bfa34cd82e308a31711f138a140 SHA1 c9a81d98534c7a95d5d7f3c41298053d645b157e SHA256 63d38f338db6940523fb8488f884f34f53eeef5945edcfa41a24d7ee2410a33a
+MD5 a9736549ecc474198f8b99bc8ba0e816 files/fedora-ds-console-cvs.sh 347
+RMD160 69a9fa2f78e67bfa34cd82e308a31711f138a140 files/fedora-ds-console-cvs.sh 347
+SHA256 63d38f338db6940523fb8488f884f34f53eeef5945edcfa41a24d7ee2410a33a files/fedora-ds-console-cvs.sh 347
+DIST fedora-ds-console-1.1.0-pre20071006.tar.bz2 800436 RMD160 a72e74ed22ca1ab6c835d3679f094532abbac713 SHA1 a5e871d0430855f3dfb67ed933ae8443bb01f213 SHA256 4000250f3339113cfeaee1b7bd56db60203fd529e2a51be12763da33218611f7
+EBUILD fedora-ds-console-1.1.0_pre20071006.ebuild 2077 RMD160 c10b67ca2f74fa34a4d61141478fa512e8366f45 SHA1 2486246bd414b55048223452b01b775526ec10f2 SHA256 d4e2d1e9f1c5495b2a7cfcb51881e56d7d464afb45bbeb79e25b13a148380efa
+MD5 a2eb7f9f25781eb14bffd24986ae014a fedora-ds-console-1.1.0_pre20071006.ebuild 2077
+RMD160 c10b67ca2f74fa34a4d61141478fa512e8366f45 fedora-ds-console-1.1.0_pre20071006.ebuild 2077
+SHA256 d4e2d1e9f1c5495b2a7cfcb51881e56d7d464afb45bbeb79e25b13a148380efa fedora-ds-console-1.1.0_pre20071006.ebuild 2077
+MD5 457e8baf6cfe6e401385551911e0222a files/digest-fedora-ds-console-1.1.0_pre20071006 310
+RMD160 0e8d8b22c94008ebd539dd479861e652a98e3285 files/digest-fedora-ds-console-1.1.0_pre20071006 310
+SHA256 253ff213466b0fa98f00f3997c8af9a063bbbdce8534c1f90d7710596df10660 files/digest-fedora-ds-console-1.1.0_pre20071006 310
diff --git a/app-admin/fedora-ds-console/fedora-ds-console-1.1.0_pre20071006.ebuild b/app-admin/fedora-ds-console/fedora-ds-console-1.1.0_pre20071006.ebuild
new file mode 100644
index 00000000..697ad70e
--- /dev/null
+++ b/app-admin/fedora-ds-console/fedora-ds-console-1.1.0_pre20071006.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 eutils java-ant-2 versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_V=1.1.0
+
+DESCRIPTION="A Java based remote management console used for Managing Fedora Administration Server and Fedora Directory Server."
+HOMEPAGE="http://directory.fedoraproject.org/"
+SRC_URI="http://ftp.mars.arge.at/fedora-ds/fedora-ds-console-${MY_PV}.tar.bz2
+        ftp://mars.arge.at/fedora-ds/fedora-ds-console-${MY_PV}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc source"
+
+S="${WORKDIR}/fedora-ds-console-${MY_PV}"
+
+COMMON_DEP="=dev-java/jss-4*
+	>=dev-java/ldapsdk-4.0
+	>=dev-java/idm-console-framework-1.1"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+	
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# gentoo java rules say no jars with version number
+	# so sed away the version indicator '-'  
+	sed -e "s!-\*!\*!g" -i build.xml
+	
+	java-pkg_jarfrom ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jarfrom jss-3.4 xpclass.jar jss4.jar
+	java-pkg_jarfrom idm-console-framework-1.1
+}
+
+src_compile() {
+	eant -Dbuilt.dir=${S}/build \
+	     -Dldapjdk.location=${S} \
+	     -Djss.location=${S} \
+	     -Dconsole.location=${S} ${antflags}
+	
+	use doc && eant -Dbuilt.dir=${S}/build \
+	     -Dldapjdk.location=${S} \
+	     -Djss.location=${S} \
+	     -Dconsole.location=${S} ${antflags} javadoc
+
+}
+
+src_install() {
+	java-pkg_jarinto /usr/share/dirsrv/java
+	java-pkg_newjar ${S}/build/package/fedora-ds-${MY_V}.jar fedora-ds.jar
+	java-pkg_newjar ${S}/build/package/fedora-ds-${MY_V}_en.jar fedora-ds_en.jar
+	insinto /usr/share/dirsrv/manual/en/slapd
+	doins ${S}/help/en/*.html
+	doins ${S}/help/en/tokens.map
+	insinto /usr/share/dirsrv/manual/en/slapd/help
+	doins ${S}/help/en/help/*.html
+#       dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+        use doc && java-pkg_dojavadoc build/doc
+        use source && java-pkg_dosrc src/com
+
+}
diff --git a/app-admin/fedora-ds-console/files/digest-fedora-ds-console-1.1.0_pre20071006 b/app-admin/fedora-ds-console/files/digest-fedora-ds-console-1.1.0_pre20071006
new file mode 100644
index 00000000..3752a886
--- /dev/null
+++ b/app-admin/fedora-ds-console/files/digest-fedora-ds-console-1.1.0_pre20071006
@@ -0,0 +1,3 @@
+MD5 ac58aeb92b8a7c7f2bc821f26622dce3 fedora-ds-console-1.1.0-pre20071006.tar.bz2 800436
+RMD160 a72e74ed22ca1ab6c835d3679f094532abbac713 fedora-ds-console-1.1.0-pre20071006.tar.bz2 800436
+SHA256 4000250f3339113cfeaee1b7bd56db60203fd529e2a51be12763da33218611f7 fedora-ds-console-1.1.0-pre20071006.tar.bz2 800436
diff --git a/app-admin/fedora-ds-console/files/fedora-ds-console-cvs.sh b/app-admin/fedora-ds-console/files/fedora-ds-console-cvs.sh
new file mode 100755
index 00000000..715be29d
--- /dev/null
+++ b/app-admin/fedora-ds-console/files/fedora-ds-console-cvs.sh
@@ -0,0 +1,13 @@
+#!/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