diff --git a/config/environment.rb b/config/environment.rb
index 315f3e4b..c7e0e47a 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -15,8 +15,6 @@ Rails::Initializer.run do |config|
 
   # Add additional load paths for sweepers
   config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
-  
-  config.plugin_paths = ['lib/plugins', 'vendor/plugins']
 
   # Force all environments to use the same logger level 
   # (by default production uses :info, the others :debug)
@@ -61,9 +59,6 @@ Rails::Initializer.run do |config|
 	#config.action_mailer.delivery_method = :test
 	config.action_mailer.delivery_method = :smtp  
 
-  # Uncomment this line if the engines plugin is installed.
-  # This will ensure that engines is loaded first.
-  # config.plugins = ["engines", "*"]
 end
 
 ActiveRecord::Errors.default_error_messages = {
diff --git a/extra/sample_plugin/README b/extra/sample_plugin/README
index eed8b9a2..fe3fac73 100644
--- a/extra/sample_plugin/README
+++ b/extra/sample_plugin/README
@@ -6,12 +6,9 @@ This is a sample plugin for Redmine
 
 === Adding plugin support to Redmine
 
-1. Install engines plugin
+To add plugin support to Redmine, install engines plugin:
    See: http://rails-engines.org/
 
-2. Uncomment this line in config/environment.rb:
-   config.plugins = ["engines", "*"]
-
 === Plugin installation
 
 1. Copy the plugin directory into the vendor/plugins directory
diff --git a/lib/plugins/acts_as_event/init.rb b/vendor/plugins/acts_as_event/init.rb
similarity index 100%
rename from lib/plugins/acts_as_event/init.rb
rename to vendor/plugins/acts_as_event/init.rb
diff --git a/lib/plugins/acts_as_event/lib/acts_as_event.rb b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
similarity index 100%
rename from lib/plugins/acts_as_event/lib/acts_as_event.rb
rename to vendor/plugins/acts_as_event/lib/acts_as_event.rb
diff --git a/lib/plugins/acts_as_searchable/init.rb b/vendor/plugins/acts_as_searchable/init.rb
similarity index 100%
rename from lib/plugins/acts_as_searchable/init.rb
rename to vendor/plugins/acts_as_searchable/init.rb
diff --git a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
similarity index 100%
rename from lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
rename to vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
diff --git a/lib/plugins/acts_as_watchable/init.rb b/vendor/plugins/acts_as_watchable/init.rb
similarity index 100%
rename from lib/plugins/acts_as_watchable/init.rb
rename to vendor/plugins/acts_as_watchable/init.rb
diff --git a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
similarity index 100%
rename from lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
rename to vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb