diff --git a/net-nds/apacheds/Manifest b/net-nds/apacheds/Manifest
index 7087a67..fb31ccd 100644
--- a/net-nds/apacheds/Manifest
+++ b/net-nds/apacheds/Manifest
@@ -1,4 +1,5 @@
 AUX apacheds.conf 743 SHA256 d302e492d1c876185241512b75883ac4debbad7a22519d308909065dc149d5b1 SHA512 85d01ef0c5be92d1c3cd9c2d551d00f3717dcac1d58e040caeb8b173f033ab18cb30d084cb9f4215e015b11de7496c09788c99b2e2ba3ee4c2c072bcd381b57f WHIRLPOOL 9c0697483ba9d1ae0f1b1b1efaa832ccafce017aab400cbb53d5da7987b5699828c4ea80a7626a310e049b0ee6e408af75a8b382de7b49b8f1ea6ef98f547ebb
-AUX apacheds.init 3141 SHA256 cec6d82bd9a17e8e7f7505e57c5c18f9571d1ec8df4c9a2ccb73e323387a4ada SHA512 58be8ce85e956f6658e5086bd983ce1a75cc0952d3ad16dbc33e78957503f7945315615cefdc90a80f110ef9fb2de86a7de3b3aa257a1a3d5754bd1a6b3100fc WHIRLPOOL d61690dfc742efe2950807d78066dbda6cc83a6b323bee939399bd43df4170722aecd8c61fe4f870093621141e88d088c06f9cc2ac486627b64f43ca5d624d7a
+AUX apacheds.init 3150 SHA256 49da6de5b620991ba4446eef9daf5725e28bfbf13a24bb54df8ddcf9dfc313a6 SHA512 e57572f9024a4b4298abdd7c6448bb1dd1b6fcd881c0f90906b9251bb3973f7c8b6219dfe0778e0267912170d2f6477563d73fc020b264c319596c9a006ccc73 WHIRLPOOL cfb33fd4cc021ec5760e9b439ac5e65f0cbfab813bfd52c30ea6ef218d9a782b2fe00bca36c2e983e50c020aafa200858402cf61eb041d7a568e2204f521cf87
+AUX log4j.properties 703 SHA256 d65f27be3382753e281dda7f37bd79fd4b750dafe0be5389541e04832e71022c SHA512 e9bd4df29faba9fd7d4c13a5d02e27938b86cf57f1ffebb312c9a118396d399a876087c3f51b923595041a548ba12db5d3b7b0d2f5035495e5ec8d23a066a22f WHIRLPOOL a3bd8f388426970cec5c5efb90d3c21ab4027b84270f2b4e1754b02b6fa66415c4ec48f878f464a7a5da0e98292a09d799fc78a9b8342c1cb9ba9d53f7bf086b
 DIST apacheds-2.0.0-M15.tar.gz 9700047 SHA256 9320a1374284af75875c7f895c0283bd282b2e8e16c65ad7d1ad19b6f80f4947 SHA512 4aea1cd95206a92781ca29d7518f8b3b01aebed4f4284eec196abc8bdde0dcdea315eabbf80a03e54c9923c6d683424edfa488a12d69477ea57b527fe22944b6 WHIRLPOOL 6c9ffd6cc73957b71debce91866450d89f4ff28eb43bbd5f9b7701cc22a88bfc03bf553353c50e37d72f6b4eb17dd5d71c98d1441d19ce68b5a036a6c1b1959d
-EBUILD apacheds-2.0.0_rc15.ebuild 1429 SHA256 3995cc44138677cc043c3f7af237af366a8418ef5df25780483fb9983e5a50ff SHA512 52ddc916c3fec895ce47f65b0b85c7ac45a68e3a8109a80fb7460264d351b705a548f4385359877db7730618bb4de5c4592f5fa280879506d974f165fbecf521 WHIRLPOOL 2532cc646a425da29d26da43113908d58a3d4b4da9439a0fd63f57c3c95aa8c0e0d67072c88065518f8a04c7f9c6c008472b1a42b42b4e6e09ba56c9e8ab2d50
+EBUILD apacheds-2.0.0_rc15.ebuild 1464 SHA256 6d83cedd4817115d2044586698cdbac9dd5ab21619b2ff9e62e37d197f5cdec0 SHA512 29089a6dc7d7cd922f67cf3c525de5221ea63060b3c0b8c8bc8a8dcaa272e2d5bb52bd0f2aae2bc5bd384c5e81f08a5f1467babb85ac6ee9088aaa7327b1321a WHIRLPOOL 587620971222ae239e2b547bc3d9fd72287028a6b9a3777bb3fa5a1d68a3f42b6ed9e1b77ff75fdeb4422b9410d1685ca90ce3ecfc38821b950f5ec3ee0ebdb6
diff --git a/net-nds/apacheds/apacheds-2.0.0_rc15.ebuild b/net-nds/apacheds/apacheds-2.0.0_rc15.ebuild
index 55c0399..0de3399 100644
--- a/net-nds/apacheds/apacheds-2.0.0_rc15.ebuild
+++ b/net-nds/apacheds/apacheds-2.0.0_rc15.ebuild
@@ -27,8 +27,8 @@ pkg_setup() {
 }
 
 src_install() {
-	insinto /usr/share/${PN}
-	doins lib/apache*.jar
+    insinto /usr/share/${PN}
+    doins lib/apache*.jar
 
     keepdir "/var/lib/${PN}"
     fowners apacheds:apacheds "/var/lib/${PN}"
@@ -40,16 +40,17 @@ src_install() {
     fperms 750 "/var/log/${PN}"
     keepdir "/var/tmp/${PN}"
     fowners apacheds:apacheds "/var/tmp/${PN}"
-    keepdir "/etc/${PN}"
-    fowners apacheds:apacheds "/etc/${PN}"
 
-    cp "${FILESDIR}"/apacheds{.conf,.init} "${T}" || die 
-	eprefixify "${T}"/apacheds{.conf,.init}
-	sed -i -e "s|@SLOT@|${SLOT}|g" \
-		-e "s|@INSTANCE_USER@|apacheds|g" \
-		-e "s|@INSTANCE_GROUP@|apacheds|g" \
-		"${T}"/apacheds{.conf,.init} || die 
+    insinto "/var/run/${PN}/conf"
+    doins "${FILESDIR}"/log4j.properties
 
-    newconfd "${T}"/apacheds.conf ${PN} 
+    cp "${FILESDIR}"/apacheds{.conf,.init} "${T}" || die
+    eprefixify "${T}"/apacheds{.conf,.init}
+    sed -i -e "s|@SLOT@|${SLOT}|g" \
+        -e "s|@INSTANCE_USER@|apacheds|g" \
+        -e "s|@INSTANCE_GROUP@|apacheds|g" \
+        "${T}"/apacheds{.conf,.init} || die
+
+    newconfd "${T}"/apacheds.conf ${PN}
     newinitd "${T}"/apacheds.init ${PN}
 }
diff --git a/net-nds/apacheds/files/apacheds.init b/net-nds/apacheds/files/apacheds.init
index b7fdefc..b84f908 100644
--- a/net-nds/apacheds/files/apacheds.init
+++ b/net-nds/apacheds/files/apacheds.init
@@ -48,7 +48,7 @@ start()	{
 			${JAVA_OPTS} \
 			${ADS_CONTROLS} \
 			${ADS_EXTENDED_OPERATIONS} \
-			-Dlog4j.configuration=file:/etc/apacheds/log4j.properties \
+			-Dlog4j.configuration=file:/var/run/apacheds/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
new file mode 100644
index 0000000..a5de44d
--- /dev/null
+++ b/net-nds/apacheds/files/log4j.properties
@@ -0,0 +1,16 @@
+# 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