diff --git a/config/application.rb b/config/application.rb
index e7822733..ef1d6552 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -38,16 +38,11 @@ def self.data_root
     @data_root ||= Pathname.new( ENV['CRUISE_DATA_ROOT'] || File.join(CruiseControl.home_directory, ".cruise") )
   end
   
-  class Application < Rails::Application  
-    unless defined? CRUISE_DATA_ROOT
-      CRUISE_DATA_ROOT = CruiseControl.data_root.to_s
-      puts "cruise data root = '#{CRUISE_DATA_ROOT}'"
-    end
-    
+  class Application < Rails::Application      
     # Add additional load paths for your own custom dirs
     config.autoload_paths << Rails.root.join('lib')
-    config.autoload_paths << File.join(CRUISE_DATA_ROOT, 'builder_plugins')
     config.autoload_paths << Rails.root.join('lib', 'builder_plugins')
+    config.autoload_paths << CruiseControl.data_root.join('builder_plugins')
     
     config.after_initialize do
       require Rails.root.join('config', 'configuration')
@@ -60,4 +55,9 @@ class Application < Rails::Application
       BuilderPlugin.load_all
     end
   end
+end
+
+unless defined? CRUISE_DATA_ROOT
+  CRUISE_DATA_ROOT = CruiseControl.data_root.to_s
+  puts "cruise data root = '#{CRUISE_DATA_ROOT}'"
 end
\ No newline at end of file
diff --git a/config/configuration.rb b/config/configuration.rb
index 2c0864ec..c22fa077 100644
--- a/config/configuration.rb
+++ b/config/configuration.rb
@@ -29,7 +29,7 @@ def data_root=(root)
     end
 
     def data_root
-      @data_root ||= Pathname.new(CruiseControl::Application::CRUISE_DATA_ROOT)
+      @data_root ||= CruiseControl.data_root
     end
 
     def projects_root