diff --git a/net-nds/apacheds/Manifest b/net-nds/apacheds/Manifest
index 2b00fd7..2c70b6a 100644
--- a/net-nds/apacheds/Manifest
+++ b/net-nds/apacheds/Manifest
@@ -1,5 +1,4 @@
 AUX apacheds.conf 743 SHA256 d302e492d1c876185241512b75883ac4debbad7a22519d308909065dc149d5b1 SHA512 85d01ef0c5be92d1c3cd9c2d551d00f3717dcac1d58e040caeb8b173f033ab18cb30d084cb9f4215e015b11de7496c09788c99b2e2ba3ee4c2c072bcd381b57f WHIRLPOOL 9c0697483ba9d1ae0f1b1b1efaa832ccafce017aab400cbb53d5da7987b5699828c4ea80a7626a310e049b0ee6e408af75a8b382de7b49b8f1ea6ef98f547ebb
-AUX apacheds.init 3150 SHA256 49da6de5b620991ba4446eef9daf5725e28bfbf13a24bb54df8ddcf9dfc313a6 SHA512 e57572f9024a4b4298abdd7c6448bb1dd1b6fcd881c0f90906b9251bb3973f7c8b6219dfe0778e0267912170d2f6477563d73fc020b264c319596c9a006ccc73 WHIRLPOOL cfb33fd4cc021ec5760e9b439ac5e65f0cbfab813bfd52c30ea6ef218d9a782b2fe00bca36c2e983e50c020aafa200858402cf61eb041d7a568e2204f521cf87
-AUX log4j.properties 703 SHA256 d65f27be3382753e281dda7f37bd79fd4b750dafe0be5389541e04832e71022c SHA512 e9bd4df29faba9fd7d4c13a5d02e27938b86cf57f1ffebb312c9a118396d399a876087c3f51b923595041a548ba12db5d3b7b0d2f5035495e5ec8d23a066a22f WHIRLPOOL a3bd8f388426970cec5c5efb90d3c21ab4027b84270f2b4e1754b02b6fa66415c4ec48f878f464a7a5da0e98292a09d799fc78a9b8342c1cb9ba9d53f7bf086b
+AUX apacheds.init 3363 SHA256 94e07ff02e09906893c63d36eb9c713de0e4e85267e35071e86342f6348c5a52 SHA512 79531530739737540af519c22476963593dbf890cad4c43308bce93649f93e9f49446b5781bf596a7a454a1a1aa0fdb98e46f3d09a5a5aca97712b916d7436e1 WHIRLPOOL 126aa57b2bc66f877cfbc6d25cb1794a254bef8c9deca37f52ee92b18fe3a38a0dfef4a1f52d29d4ae9640fe4906dcdbc95915648fa35c174d7cf4bba89d88b1
 DIST apacheds-2.0.0-M16.tar.gz 9823176 SHA256 e7d768852338f04f12ec3b3bfc0e11ea2346bcaebe07a21520136297e136aa34 SHA512 3394afcc44819541f5ca99ce7be97f8dd3c258585236714d4044432c19e2492874018eeff4374728d242f7e6fd7ed8f48fe6ba466c363974000cde0ce5d18871 WHIRLPOOL 394d0df96079dae502f8548e1f9f64812aab78b89c9fb07b36cbb0b03990e25773ac5ce574aa310ce5df078f45d74d47d615f518f27d31e4f484d7280b98e75c
-EBUILD apacheds-2.0.0_rc16.ebuild 1492 SHA256 3fa50d3f277c05cf5e1de78078c2f86829b81f210769944d587ca2762bb55ba6 SHA512 9a502304a8b3f2bfec7d58ee1ec6c7336b447e083101a5a95ab8ebc32c1b7e5949b915033dc0522bc41fc4cf90627876b5eb7c04616521586d1efd67caa0802e WHIRLPOOL f6d1435a724bd66db7c97d98dbd02e27d3ee8ae05cf491c4731e8817ab17092e449bf1f7205e83ad0253e3f9db325bca6f8c21f3e96c04a72e98191d62a06688
+EBUILD apacheds-2.0.0_rc16.ebuild 1601 SHA256 33a269691dc7f30a0b296f880e47ffcdd15366177db9b9eefd22b5f974163626 SHA512 99dcfa70ab6d9166e6029e586845a8be3c284b2b21e1a2016c5fd15d4a1bf429a65c334ab369f2dea7fb6849333f39c8473dcf021aa720e5316c47318c468a33 WHIRLPOOL 7f854c7f2c716494f88b089ec932b6894d3138a1d06e9d9089eb12c49870012b9415bad3c4bc6856c9316e253bfaafcfd4dcb1bcdc35d84982a43960f9172b24
diff --git a/net-nds/apacheds/apacheds-2.0.0_rc16.ebuild b/net-nds/apacheds/apacheds-2.0.0_rc16.ebuild
index 32e9abc..a91aadf 100644
--- a/net-nds/apacheds/apacheds-2.0.0_rc16.ebuild
+++ b/net-nds/apacheds/apacheds-2.0.0_rc16.ebuild
@@ -30,21 +30,22 @@ pkg_setup() {
 
 src_install() {
     insinto /usr/share/${PN}
-    doins lib/apache*.jar
+    doins lib/apacheds*.jar
 
     keepdir "/var/lib/${PN}"
     fowners apacheds:apacheds "/var/lib/${PN}"
     fperms 750 "/var/lib/${PN}"
-    keepdir "/var/run/${PN}"
-    fowners apacheds:apacheds "/var/run/${PN}"
     keepdir "/var/log/${PN}"
     fowners apacheds:apacheds "/var/log/${PN}"
     fperms 750 "/var/log/${PN}"
     keepdir "/var/tmp/${PN}"
     fowners apacheds:apacheds "/var/tmp/${PN}"
 
-    insinto "/var/run/${PN}/conf"
-    doins "${FILESDIR}"/log4j.properties
+    insinto "/etc/default/${PN}"
+    cp instances/default/conf/* ${T}
+    sed -i -e "s|\(layout\.ConversionPattern=\).*$|\1%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n|g" \
+        "${T}/log4j.properties"
+    doins "${T}"/log4j.properties "${T}"/config.ldif
 
     cp "${FILESDIR}"/apacheds{.conf,.init} "${T}" || die
     eprefixify "${T}"/apacheds{.conf,.init}
diff --git a/net-nds/apacheds/files/apacheds.init b/net-nds/apacheds/files/apacheds.init
index b84f908..6770807 100644
--- a/net-nds/apacheds/files/apacheds.init
+++ b/net-nds/apacheds/files/apacheds.init
@@ -28,6 +28,15 @@ start()	{
 		eend 1
 	fi
 
+        PERM="--group=${APACHEDS_GROUP} --owner=${APACHEDS_USER}"
+        if [ ! -e "${APACHEDS_HOME}" ]; then
+                install ${PERM} -d "${APACHEDS_HOME}"
+        fi
+        if [ ! -e "${APACHEDS_HOME}/conf" ]; then
+                install ${PERM} -d "${APACHEDS_HOME}/conf"
+                install ${PERM} /etc/default/apacheds/* "${APACHEDS_HOME}/conf/"
+        fi
+
 	ADS_CONTROLS="-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
 
 	ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations=org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
@@ -48,7 +57,7 @@ start()	{
 			${JAVA_OPTS} \
 			${ADS_CONTROLS} \
 			${ADS_EXTENDED_OPERATIONS} \
-			-Dlog4j.configuration=file:/var/run/apacheds/conf/log4j.properties \
+			-Dlog4j.configuration=file:${APACHEDS_HOME}/conf/log4j.properties \
 			-Dapacheds.log.dir=/var/log/${RC_SVCNAME} \
 			-Djava.io.tmpdir="${APACHEDS_TMPDIR}" \
 			-classpath "${CLASSPATH}" \
diff --git a/net-nds/apacheds/files/log4j.properties b/net-nds/apacheds/files/log4j.properties
deleted file mode 100644
index a5de44d..0000000
--- a/net-nds/apacheds/files/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Root logger option
-log4j.rootLogger=DEBUG, file
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=/var/log/apacheds/apacheds.log
-log4j.appender.file.MaxFileSize=10MB
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n