diff --git a/doc-src/content/stylesheets/screen.sass b/doc-src/content/stylesheets/screen.sass
index 5d9241b2..d8a52445 100644
--- a/doc-src/content/stylesheets/screen.sass
+++ b/doc-src/content/stylesheets/screen.sass
@@ -4,6 +4,8 @@
 
 @import defaults
 @import slideshow
+@import compass/layout
+@import compass/utilities
 
 /* @group STRUCTURE
 
@@ -132,13 +134,27 @@ aside[role="sidebar"]
     +leader(1,14px)
     +trailer(1,14px)
 
+$footer-height: 4em + $base-rhythm-unit
++sticky-footer($footer-height, "#wrap", "#wrap-footer", "footer")
+
 footer[role="contentinfo"]
   +container
-  +leader(3)
+  // This height adjustment is because of the leading border
+  height: $footer-height - $base-rhythm-unit
   color: #999999
-  .license
-    +full
+  +leading-border(2px)
+  .legalese
+    +columns(3)
+    +alpha
     +adjust-font-size-to(14px)
+    p
+      margin: 0 0 1em 0
+  .links
+    +columns(9)
+    +omega
+    +adjust-font-size-to(14px)
+    ul
+      +horizontal-list
 
 /* @end
 
diff --git a/doc-src/layouts/basic.haml b/doc-src/layouts/basic.haml
new file mode 100644
index 00000000..e173fb19
--- /dev/null
+++ b/doc-src/layouts/basic.haml
@@ -0,0 +1,19 @@
+!!!5
+- # This template is just the stuff until the body tag.
+%html.no-js{:dir => "ltr", :lang => "en"}
+  %head
+    %meta{:charset => "utf-8"}/
+    %meta{:content => "chrome=1", "http-equiv" => "X-UA-Compatible"}
+    %link(rel="shortcut icon" type="image/png" href="/docs/images/compass_icon.png")
+    %title
+      #{@item[:title]} | Compass Documentation
+    <!--[if !IE 6]><!-->
+    %link{:charset => "utf-8", :href => "/docs/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}
+    <!--<![endif]-->
+    /[if gte IE 7]
+      %link{:charset => "utf-8", :href => "/docs/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}
+    /[if IE 6]
+      %link{:charset => "utf-8", :href => "http://universal-ie6-css.googlecode.com/files/ie6.0.3.css", :rel => "stylesheet", :type => "text/css"}
+    - if @item[:content_for_additional_css]
+      %style(type="text/css")= @item[:content_for_additional_css]
+  %body{body_attributes(@item)}= yield
\ No newline at end of file
diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml
index 10d4277d..c55ca567 100644
--- a/doc-src/layouts/main.haml
+++ b/doc-src/layouts/main.haml
@@ -1,21 +1,5 @@
-!!!5
-%html.no-js{:dir => "ltr", :lang => "en"}
-  %head
-    %meta{:charset => "utf-8"}/
-    %meta{:content => "chrome=1", "http-equiv" => "X-UA-Compatible"}
-    %link(rel="shortcut icon" type="image/png" href="/docs/images/compass_icon.png")
-    %title
-      #{@item[:title]} | Compass Documentation
-    <!--[if !IE 6]><!-->
-    %link{:charset => "utf-8", :href => "/docs/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}
-    <!--<![endif]-->
-    /[if gte IE 7]
-      %link{:charset => "utf-8", :href => "/docs/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}
-    /[if IE 6]
-      %link{:charset => "utf-8", :href => "http://universal-ie6-css.googlecode.com/files/ie6.0.3.css", :rel => "stylesheet", :type => "text/css"}
-    - if @item[:content_for_additional_css]
-      %style(type="text/css")= @item[:content_for_additional_css]
-  %body{body_attributes(@item)}
+- render "basic" do
+  #wrap
     %nav#skip-links
       %a{:href => "#content"} skip to content
     %header#banner{:role => "banner"}
@@ -53,6 +37,8 @@
     - if @item[:content_for_module_nav]
       %nav#module-nav= @item[:content_for_module_nav]
     #page= yield
-    %script(src="/docs/javascripts/jquery-1.3.2.min.js")
-    %script(src="/docs/javascripts/fixups.js" deferred)
-    = render "partials/analytics"
+    #wrap-footer
+  %footer(role="contentinfo")= render "partials/footer"
+  %script(src="/docs/javascripts/jquery-1.3.2.min.js")
+  %script(src="/docs/javascripts/fixups.js" deferred)
+  = render "partials/analytics"
diff --git a/doc-src/layouts/partials/footer.haml b/doc-src/layouts/partials/footer.haml
index 82b9b656..6eb569f6 100644
--- a/doc-src/layouts/partials/footer.haml
+++ b/doc-src/layouts/partials/footer.haml
@@ -1,7 +1,11 @@
 .legalese
   %p
-    This website is Copyright &copy; 2010 Christopher Eppstein.<br>
-    It is licensed under XXX TODO XXX.
+    :plain
+      <a rel="license" href="/docs/copyright/"
+         id="cc-logo"><img alt="Creative Commons License" style="border-width:0"
+         src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/88x31.png" /></a>
+    %br
+    by Christopher M. Eppstein.
   - if @item[:content_for_footer]
     %hr
     = @item[:content_for_footer]