diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index c7101179..12544e7d 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -119,15 +119,13 @@ module Jekyll
       "#<Jekyll:Page @name=#{self.name.inspect}>"
     end
 
-    private
+    def html?
+      output_ext == '.html'
+    end
 
-      def html?
-        output_ext == '.html'
-      end
-
-      def index?
-        basename == 'index'
-      end
+    def index?
+      basename == 'index'
+    end
 
   end
 
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 2e3d9c98..e43d0b89 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -237,6 +237,7 @@ module Jekyll
           "time"       => self.time,
           "posts"      => self.posts.sort { |a,b| b <=> a },
           "pages"      => self.pages,
+          "html_pages" => self.pages.reject { |page| !page.html? },
           "categories" => post_attr_hash('categories'),
           "tags"       => post_attr_hash('tags')})}
     end
diff --git a/test/source/sitemap.xml b/test/source/sitemap.xml
index 8d9f0fcd..e84d32fe 100644
--- a/test/source/sitemap.xml
+++ b/test/source/sitemap.xml
@@ -14,10 +14,19 @@ layout: nil
 
   {% for post in site.posts %}
   <url>
-    <loc>http://example.com/{{ post.url }}/</loc>
+    <loc>http://example.com{{ post.url }}/</loc>
     <lastmod>{{ post.date | date: "%Y-%m-%d" }}</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.2</priority>
   </url>
   {% endfor %}
+  
+  {% for page in site.html_pages %}
+  <url>
+    <loc>http://example.com{{ page.url }}</loc>
+    <lastmod>{{ site.time | date: "%Y-%m-%d" }}</lastmod>
+    {% if page.changefreq %}<changefreq>{{ page.changefreq }}</changefreq>{% endif %}
+    {% if page.priority %}<priority>{{ page.priority }}</priority>{% endif %}
+  </url>  
+  {% endfor %}  
 </urlset>