diff --git a/www-apps/solr/Manifest b/www-apps/solr/Manifest
index 7e03d54..a578c3c 100644
--- a/www-apps/solr/Manifest
+++ b/www-apps/solr/Manifest
@@ -1,4 +1,4 @@
-AUX solr.conf.d 95 SHA256 b33ae2707ab4ecb24584d8bfce0738021d8c0859440a22a82a9f0cc450590ab7 SHA512 1a4be04de7aec43652fcc57877bcfef287f9010df807bda1a52bd2c13ed31bc61a39302e1820d8f0bd1a2f1e01c9188a669b9bc58b1001b26261ecdeea441f05 WHIRLPOOL 864f790b4c30715a327f014a232bd434cc2b9e6fe8bae748ac7e912a9cfb3abc44138013324c67dc3f296e4c1903480f615b2cb13f58bc313effd3296e4716cc
-AUX solr.init.d 525 SHA256 c0bc2a75dc902fdedebb049ab63b5d1a53fd8f00657311910e6135dc0471864b SHA512 244227d7e931b1fbb68112ebb61224c246b999a252eca117426ed065f6c2e08c1118407f8da0771c639bb670663be882a06e2ac2587ffbd831ff8526c5cc5628 WHIRLPOOL 4a6b61580fb9f490ef2836dc21c78234a47d60c2edfe5b16d3b39ee73d236a27c3479fec45546ccb4d39d0e06cfb85888e21e1bfabc48370cee701a2aceccb6e
+AUX solr.conf.d 147 SHA256 683df3984893b815f66214bb4ed5f498111cb4fbac45bb679db022fff25193dd SHA512 96411fc5a0a8b19f8a7136b2a4964096718e11b869207cb8188dde42528813c4a18ebeeb48ae25c8ddc8d910c7c18547a1dae81df33ab2a124fc97ee41ad49f7 WHIRLPOOL 6201d8b5c9ad9a03daa5c10be2bd0c34aa4d03fe998dbaeaf017e0f70128e4841fb644347fc09683216baae7b1fff3fdf8ff2eff9f2bb46f59ccbb79d5933e03
+AUX solr.init.d 591 SHA256 3db3477c6cd5c826c9df11e4b977b438c39c639e61d118e5920c84b15bd2c7a8 SHA512 62bac521c6813c9cea54fea81b451f1c818d11058afe91f21c687da673559bfb219615f33e776f6112e2504f11853b0f54b545e784976d159a9d91b9d99708d0 WHIRLPOOL dab9f6a13b36f4843def68c11356865098c015d9dee906348814866ac3d6f87d7379d481a28ad902165114c43b68dfcf896f4fdbb3aee5481d55aded5576d885
 DIST solr-5.5.4.tgz 136766786 SHA256 c1528e4afc9a0b8e7e5be0a16f40bb4080f410d502cd63b4447d448c49e9f500 SHA512 818caff4ad6180fb670ddbeb61701d8a4dd9f4a844cf21066297dff1bde19662d1a1f77ac00dcc89b4c8dd31d5dcc1a824746affa293d8963616458c87ec3ac6 WHIRLPOOL 4fb0a2a09c256f4e5faaece6bfb85b35e6ce5752b79a9c5cea5805235af5cb2a347717b59e32535db0ad6aba6fdf41a52955252d74639628c8932feb529fde5c
 EBUILD solr-5.5.4.ebuild 2248 SHA256 d8832a8e06c63054f8af691c5431dd414f8226a8c0c2e1499c0860ca3bde950d SHA512 014addb434e7e4de2058c58e6c96ede8ef32381a7f4de9fdf64a8b8c5aa9f08e27bc6b058dba7fe5dd88df4b452a113674b2d6f8e0cfec96176771ab38fae2ab WHIRLPOOL 184111679a9da7e958b7779ca785254c83c944c12948f2ce7a57334b78c15b9e7995b7eb042a9410434cf14a57475c51e3028c0bbc1d5043f2b199e1b6ae1d14
diff --git a/www-apps/solr/files/solr.conf.d b/www-apps/solr/files/solr.conf.d
index 15f5bc6..19c525d 100644
--- a/www-apps/solr/files/solr.conf.d
+++ b/www-apps/solr/files/solr.conf.d
@@ -4,4 +4,6 @@ SOLR_TMPDIR=/var/tmp/solr
 
 SOLR_PORT=8983
 
-SOLR_OPTS=""
+SOLR_LOGS_DIR="/var/log/solr"
+
+SOLR_OPTS="-s /var/lib/solr/data"
diff --git a/www-apps/solr/files/solr.init.d b/www-apps/solr/files/solr.init.d
index 83029ac..31c8881 100755
--- a/www-apps/solr/files/solr.init.d
+++ b/www-apps/solr/files/solr.init.d
@@ -20,6 +20,9 @@ start_pre() {
 	rm -rf ${SOLR_TMPDIR}
 	mkdir ${SOLR_TMPDIR}
 	chown solr:solr ${SOLR_TMPDIR}
+	mkdir /run/solr
+	chown solr:solr /run/solr
+	export SOLR_LOGS_DIR
 }
 
 status() {