diff --git a/net-nds/fedora-ds-base/ChangeLog b/net-nds/fedora-ds-base/ChangeLog
index 0b36ac06..dfd4a612 100644
--- a/net-nds/fedora-ds-base/ChangeLog
+++ b/net-nds/fedora-ds-base/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
+  fedora-ds-base-1.1.1.ebuild:
+  does not build without sasl gentoo Bug #104554 comment 55 thx Vladimir
+  Rusinov
+
   31 Jul 2008; Mario Fetka <mario.fetka@gmail.com> files/dirsrv.initd,
   fedora-ds-base-1.1.0.ebuild, +fedora-ds-base-1.1.1.ebuild:
   repoman cleanup & new init script with spawn process check
diff --git a/net-nds/fedora-ds-base/Manifest b/net-nds/fedora-ds-base/Manifest
index c9711231..24e04db3 100644
--- a/net-nds/fedora-ds-base/Manifest
+++ b/net-nds/fedora-ds-base/Manifest
@@ -4,6 +4,6 @@ AUX fedora-ds-cvs.sh 346 RMD160 d9659f0aa8559c59865f42e16bc611a57a63d893 SHA1 80
 DIST fedora-ds-base-1.1.0.tar.bz2 2596436 RMD160 4680a729cfdbd762e8fa8e348709e01916340854 SHA1 5ed43a030600ca2cf749c2f9f25c18c72f0a935e SHA256 9e6fc529d335d2ffd10bdd49e40bcf9c002fe6034c644a002aa0511dcc76ac70
 DIST fedora-ds-base-1.1.1.tar.bz2 2590248 RMD160 824ac88f2e901e19a1ec96f5ba9b4d94fc8f39c3 SHA1 78639f5075015cc9663f8e69aacaf2a5aa938e57 SHA256 ffd4cbbd61eef96174784e5de0c01c34738826a6b10bda4fcff6d7369c1cd0b5
 EBUILD fedora-ds-base-1.1.0.ebuild 1977 RMD160 23cd4ad7da413dbb7dc923eff6378258bc18bed6 SHA1 ed345689af61395902bd8dd033d3517c37933235 SHA256 9e247b2d294efdb7aaa6654c6c7a96090638b77721681eb061debba2de28de8a
-EBUILD fedora-ds-base-1.1.1.ebuild 1977 RMD160 23cd4ad7da413dbb7dc923eff6378258bc18bed6 SHA1 ed345689af61395902bd8dd033d3517c37933235 SHA256 9e247b2d294efdb7aaa6654c6c7a96090638b77721681eb061debba2de28de8a
-MISC ChangeLog 1325 RMD160 c798315a8bef75adbdadb6d82d3eb26df5533493 SHA1 eaffb6e606ea3e4259643fa4075375f80952f8a2 SHA256 ac8ec96990f724e9a08b4d955fa2e02acfe9d2de126469fd4b759183cdd74978
+EBUILD fedora-ds-base-1.1.1.ebuild 1950 RMD160 a43feab8a91ac4a3ad3dbf3ce614365d6e981d6f SHA1 241a6e62b3663dec9c3afcbd96a9a943a9022299 SHA256 d2ff6609e7bba680731ba08c8dda6389fb159de0d24e9585a041fd015ab4c0a7
+MISC ChangeLog 1491 RMD160 6361905aeab6d40c9881a5c901c78a03881b933d SHA1 518baa717116f7836e4d8d4ebfa1058a7580b493 SHA256 ec79be13cb69378bdea5c407d7a814e3475118d3dad0bb56ea27334ea477d6ba
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-nds/fedora-ds-base/fedora-ds-base-1.1.1.ebuild b/net-nds/fedora-ds-base/fedora-ds-base-1.1.1.ebuild
index 42ec444a..cd742e7e 100644
--- a/net-nds/fedora-ds-base/fedora-ds-base-1.1.1.ebuild
+++ b/net-nds/fedora-ds-base/fedora-ds-base-1.1.1.ebuild
@@ -11,13 +11,13 @@ SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sasl snmp ipv6 debug"
+IUSE="snmp ipv6 debug"
 
 DEPEND=">=dev-libs/nss-3.11.4
 	>=dev-libs/nspr-4.6.4
 	>=dev-libs/svrcore-4.0.3
 	>=dev-libs/mozldap-6.0.2
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.19 )
+	>=dev-libs/cyrus-sasl-2.1.19
 	>=dev-libs/icu-3.4
 	>=sys-libs/db-4.2.52
 	snmp? ( >=net-analyzer/net-snmp-5.1.2 )
@@ -35,8 +35,6 @@ src_unpack() {
 src_compile() {
 	if use amd64 ; then
 	    myconf="${myconf} --enable-64bit"
-	elif use sasl ; then
-	    myconf="${myconf} --with-sasl=yes"
 	elif use snmp ; then
 	    myconf="${myconf} --netsnmp=yes"
 	else
@@ -47,6 +45,7 @@ src_compile() {
 	econf $(use_enable debug) \
 	    ${myconf} \
 	    --with-fhs \
+	    --with-sasl=yes \
 	    || die "econf failed"
 
 	emake || die "emake failed"
@@ -72,6 +71,7 @@ src_install () {
 
 	# remove redhat style init script and install gentoo style
 	rm -rf "${D}"/etc/rc.d
+	rm -rf "${D}"/etc/default
 	newinitd "${FILESDIR}"/dirsrv.initd dirsrv
 	newconfd "${FILESDIR}"/dirsrv.confd dirsrv