auto import from //branches/cupcake/...@130745
diff --git a/tools/droiddoc/templates/footer.cs b/tools/droiddoc/templates/footer.cs
index 9462cd0..86b13ea 100644
--- a/tools/droiddoc/templates/footer.cs
+++ b/tools/droiddoc/templates/footer.cs
@@ -1,12 +1,19 @@
-
 <div id="footer">
 
-<div id="copyright">
-<?cs call:custom_copyright() ?>
-</div>
-<div id="build-info">
-<?cs call:custom_buildinfo() ?>
-</div>
+<?cs if:reference||guide ?>
+  <div id="copyright">
+    <?cs call:custom_copyright() ?>
+  </div>
+  <div id="build_info">
+    <?cs call:custom_buildinfo() ?>
+  </div>
+<?cs else ?>
+  <div id="copyright">
+    <?cs call:custom_cc_copyright() ?>
+  </div>
+<?cs /if ?>
+  <div id="footerlinks">
+    <?cs call:custom_footerlinks() ?>
+  </div>
 
-</div>
-
+</div> <!-- end footer -->
\ No newline at end of file