diff --git a/config/solr.yml.dist b/config/solr.yml.dist
deleted file mode 100644
index 940bec9..0000000
--- a/config/solr.yml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for the acts_as_solr plugin.
-#
-# If you change the host or port number here, make sure you update
-# them in your Solr config file
-
-# No change is needed to support multitenancy. Only one solr environment will be used.
-# Just remember to use 'rake multitenancy:reindex' for reindexation.
-
-production:
-  url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
-  timeout: 0
-
-development:
-  url: http://0.0.0.0:8982/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-test: &TEST
-  url: http://0.0.0.0:8981/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-cucumber:
-  <<: *TEST
diff --git a/plugins/solr/after_enable.rb b/plugins/solr/after_enable.rb
index be4fc1f..62d82f9 100644
--- a/plugins/solr/after_enable.rb
+++ b/plugins/solr/after_enable.rb
@@ -1 +1,5 @@
-puts "\nI: \e[33mAfter enabling solr you might want to run: $rake solr:reindex\e[0m\n\n"
+puts "\n"
+puts "I: \e[33mTo reindex your contents run: $ rake solr:reindex\e[0m"
+puts "I: \e[33mIf you want to run solr server on this machine you can download it running: $ rake solr:download\e[0m"
+puts "I: \e[33mMake sure your solr server is running!\e[0m"
+puts "\n"
diff --git a/plugins/solr/config/solr.yml b/plugins/solr/config/solr.yml
new file mode 100644
index 0000000..940bec9
--- /dev/null
+++ b/plugins/solr/config/solr.yml
@@ -0,0 +1,25 @@
+# Config file for the acts_as_solr plugin.
+#
+# If you change the host or port number here, make sure you update
+# them in your Solr config file
+
+# No change is needed to support multitenancy. Only one solr environment will be used.
+# Just remember to use 'rake multitenancy:reindex' for reindexation.
+
+production:
+  url: http://127.0.0.1:8983/solr
+  jvm_options: -server -Xmx192M -Xms64M
+  timeout: 0
+
+development:
+  url: http://0.0.0.0:8982/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+test: &TEST
+  url: http://0.0.0.0:8981/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+cucumber:
+  <<: *TEST
diff --git a/plugins/solr/config/solr.yml.dist b/plugins/solr/config/solr.yml.dist
new file mode 100644
index 0000000..940bec9
--- /dev/null
+++ b/plugins/solr/config/solr.yml.dist
@@ -0,0 +1,25 @@
+# Config file for the acts_as_solr plugin.
+#
+# If you change the host or port number here, make sure you update
+# them in your Solr config file
+
+# No change is needed to support multitenancy. Only one solr environment will be used.
+# Just remember to use 'rake multitenancy:reindex' for reindexation.
+
+production:
+  url: http://127.0.0.1:8983/solr
+  jvm_options: -server -Xmx192M -Xms64M
+  timeout: 0
+
+development:
+  url: http://0.0.0.0:8982/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+test: &TEST
+  url: http://0.0.0.0:8981/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+cucumber:
+  <<: *TEST
diff --git a/script/development b/script/development
index 67e85ab..eb4a3ac 100755
--- a/script/development
+++ b/script/development
@@ -5,13 +5,11 @@ export RAILS_ENV=development
 stop() {
   ./script/delayed_job stop
   ./script/feed-updater stop
-  rake -s solr:stop
   exit
 }
 
 start() {
   ./script/feed-updater start
-  rake -s solr:start
   ./script/delayed_job start
   trap stop INT TERM
   ./script/server $@
diff --git a/script/production b/script/production
index a37d0d4..1a8fb61 100755
--- a/script/production
+++ b/script/production
@@ -28,7 +28,6 @@ clear_cache() {
 do_start() {
   rake db:migrate SCHEMA=/dev/null
   clear_cache
-  rake -s solr:start
   environments_loop start
   ruby -S thin -C config/thin.yml start
 }
@@ -44,8 +43,6 @@ do_stop() {
 
   environments_loop stop ||
     stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
-
-  rake -s solr:stop || stop_via_pid_file tmp/pids/solr.*.pid
 }
 
 stop_via_pid_file() {
--
libgit2 0.21.2