diff --git a/doc-src/Rules b/doc-src/Rules
index bf03f217..07e0549e 100644
--- a/doc-src/Rules
+++ b/doc-src/Rules
@@ -46,7 +46,11 @@ compile '/reference/*/' do
 end
 
 compile '*' do
-  filter :haml, :ugly => true
+  if item[:extension] == "markdown"
+    filter :rdiscount
+  elsif item[:extension] == "haml"
+    filter :haml, :ugly => true
+  end
   layout item[:layout] || 'main'
 end
 
diff --git a/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
similarity index 99%
rename from CHANGELOG.markdown
rename to doc-src/content/CHANGELOG.markdown
index 6bcc46de..46fff0e7 100644
--- a/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -1,3 +1,9 @@
+---
+title: Compass History
+crumb: CHANGELOG
+body_id: changelog
+layout: article
+---
 COMPASS CHANGELOG
 =================
 
diff --git a/doc-src/layouts/article.haml b/doc-src/layouts/article.haml
new file mode 100644
index 00000000..17fea84e
--- /dev/null
+++ b/doc-src/layouts/article.haml
@@ -0,0 +1,2 @@
+- render 'main' do
+  %article= yield
\ No newline at end of file
diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml
index 910c1ede..1366b530 100644
--- a/doc-src/layouts/main.haml
+++ b/doc-src/layouts/main.haml
@@ -48,7 +48,7 @@
             %input#search{:name => "search", :type => "text", :value => "", :placeholder => "Search"}
     - if @item[:content_for_module_nav]
       %nav#module-nav= @item[:content_for_module_nav]
-    = yield
+    #page= yield
     %script(src="/docs/javascripts/jquery-1.3.2.min.js")
     %script(src="/docs/javascripts/fixups.js" deferred)
     = render "partials/analytics"