diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 17cbf7a4..51ee135a 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -3,7 +3,7 @@ module Jekyll
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
                   :categories, :exclude, :include, :source, :dest, :lsi, :pygments,
                   :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl
+                  :show_drafts, :keep_files, :baseurl, :site_cleaner
 
     attr_accessor :converters, :generators
 
@@ -88,7 +88,7 @@ module Jekyll
       self.converters = instantiate_subclasses(Jekyll::Converter)
       self.generators = instantiate_subclasses(Jekyll::Generator)
 
-      @site_cleaner = Cleaner.new(self)
+      self.site_cleaner = Cleaner.new(self)
     end
 
     # Internal: Setup the plugin search path
@@ -228,7 +228,7 @@ module Jekyll
     #
     # Returns nothing.
     def cleanup
-      @site_cleaner.cleanup!
+      self.site_cleaner.cleanup!
     end
 
     # Write static files, pages, and posts.