diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 48e5fa82..ce48366d 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -310,7 +310,7 @@ module Jekyll
           "time"         => self.time,
           "posts"        => self.posts.sort { |a, b| b <=> a },
           "pages"        => self.pages,
-          "static_files" => self.static_files
+          "static_files" => self.static_files,
           "html_pages"   => self.pages.reject { |page| !page.html? },
           "categories"   => post_attr_hash('categories'),
           "tags"         => post_attr_hash('tags'),
diff --git a/test/test_site.rb b/test/test_site.rb
index 7e593c86..7509480f 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -169,6 +169,14 @@ class TestSite < Test::Unit::TestCase
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
+    should "expose jekyll version to site payload" do
+      assert_equal Jekyll::VERSION, @site.site_payload['jekyll']['version']
+    end
+
+    should "expose list of static files to site payload" do
+      assert_equal @site.static_files, @site.site_payload['site']['static_files']
+    end
+
     should "deploy payload" do
       clear_dest
       @site.process