diff --git a/site/binaries/HEADER.html b/site/binaries/HEADER.html
deleted file mode 100644
index e955cb4c0..000000000
--- a/site/binaries/HEADER.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<link rel=stylesheet href="/hledger.css" type="text/css" media=screen>
-<style>
-body {padding:1em;}
-#platformdocs table {border:none;}
-#platformdocs td    {width:33%;vertical-align:top;padding-left:0.5em;padding-right:0.5em;}
-code {white-space:nowrap;}
-</style>
-
-<h1>hledger binaries</h1>
-<p>
-
-Here are the available <a href="http://hledger.org">hledger</a> binaries and some platform-specific hints.
-
-If the binary for your platform is not current or does not work,
-please <a href="http://hledger.org/MANUAL.html#installing">build the
-latest hledger with cabal</a> instead.
-
-Also please <a href="http://hledger.org/README2.html#support">send
-success/failure reports</a> and advice for making installation
-smoother.
-
-<p>
-
-<table id="platformdocs">
-	<tr>
-		<th>GNU/Linux</th>
-		<th>Mac</th>
-		<th>Windows</th>
-	</tr>
-	<tr>
-		<td>
-
-Download the appropriate (32-bit or 64-bit) linux binary, usually by right-click -> save as.
-Go to your browser's download directory in a terminal window.
-If the file did not get decompressed, do that now: <code>gunzip hledger-*</code>.
-Rename the binary to <code>hledger</code>.
-Make it executable: <code>chmod +x hledger</code>.
-Try running it: <code>./hledger --help</code>.
-
-		</td>
-		<td>
-
-Download the mac (OSX intel) binary, eg by right-click -> save as.
-Open a terminal window and go to your browser's download folder.
-If the file did not get decompressed, do that now: <code>gunzip hledger-*</code>.
-Rename the binary to <code>hledger</code>.
-Make it executable: <code>chmod +x hledger</code>.
-Try running it: <code>./hledger --help</code>.
-
-		</td>
-		<td>
-
-Download the windows binary, usually by right-click -> save as.
-Unzip the file and rename it to <code>hledger.exe</code>.
-Double-click on it to run the web interface (the default behaviour on windows).
-A security dialog may pop up, where you can choose whether other machines
-may access your hledger web interface.
-
-		</td>
-	</tr>
-</table>
-<br>
diff --git a/site/download/FOOTER.html b/site/download/FOOTER.html
new file mode 100644
index 000000000..940a235a0
--- /dev/null
+++ b/site/download/FOOTER.html
@@ -0,0 +1,20 @@
+
+
+    <div id="footer">
+      <hr />
+      &copy; 2007-2010 <a href="http://joyful.com/">Simon Michael</a> and contributors
+    </div>
+
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-3456280-3");
+pageTracker._trackPageview();
+} catch(err) {}
+</script>
+
+  </body>
+</html>
diff --git a/site/download/HEADER.html b/site/download/HEADER.html
new file mode 100644
index 000000000..d78a922e1
--- /dev/null
+++ b/site/download/HEADER.html
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>hledger.org - downloads</title>
+    <link rel="stylesheet" type="text/css" href="/style.css" />
+    <script type="text/javascript" src="/highslide/highslide.js"></script>
+    <link rel="stylesheet" type="text/css" href="/highslide/highslide.css" />
+    <script type="text/javascript">
+    hs.graphicsDir = '/highslide/graphics/';
+    hs.outlineType = 'rounded-black';
+    hs.captionEval = 'this.thumb.title';
+    </script>
+  </head>
+  <body>
+    <div style="text-align:center;">
+      <!-- <a href="./"><img src="./logo.jpg" border="0" ALT="" /></a> -->
+    </div>
+    <div id="navigation">
+      <a href="/README.html">Home</a>
+      <a href="/download/">Download</a>
+      <a href="/README2.html">Development</a>
+      <a href="/MANUAL.html">Manual</a>
+      <a href="/NEWS.html">News</a>
+      <a href="/SCREENSHOTS.html">Screenshots</a>
+      <a href="http://demo.hledger.org">Demo</a>
+    </div>
+
+
+<style>
+/* #platformdocs table {border:none;} */
+#platformdocs td {
+    width:33%;
+    vertical-align:top;
+    padding-left:0.5em;
+    padding-right:0.5em;
+    font-size:small;
+    }
+code {white-space:nowrap;}
+</style>
+
+<h1 class="title">hledger downloads</h1>
+<p>
+
+Here are hledger binaries ready to run on your platform. Choose
+GNU/Linux, Mac or Windows and follow the instructions.
+If you have any trouble, please
+<a href="http://hledger.org/README2.html#support">report it</a> (-> Support).
+To build your own custom version of hledger, see the     
+<a href="http://hledger.org/MANUAL.html#installing">cabal installation docs</a> instead.
+
+<p>
+
+<table id="platformdocs">
+	<tr>
+		<th>GNU/Linux</th>
+		<th>Mac</th>
+		<th>Windows</th>
+	</tr>
+	<tr>
+		<td>
+
+Download the appropriate (32-bit or 64-bit) linux binary, usually by right-click -> save as.
+Go to your browser's download directory in a terminal window.
+If the file did not get decompressed, do that now: <code>gunzip hledger-*</code>.
+Rename the binary to <code>hledger</code>.
+Make it executable: <code>chmod +x hledger</code>.
+Try running it: <code>./hledger --help</code>.
+
+		</td>
+		<td>
+
+Download the mac (OSX intel) binary, eg by right-click -> save as.
+Open a terminal window and go to your browser's download folder.
+If the file did not get decompressed, do that now: <code>gunzip hledger-*</code>.
+Rename the binary to <code>hledger</code>.
+Make it executable: <code>chmod +x hledger</code>.
+Try running it: <code>./hledger --help</code>.
+
+		</td>
+		<td>
+
+Click the windows binary to download and unzip it to (eg) your desktop.
+Double-click on the unzipped file to run the web interface (the default behaviour on windows).
+A security dialog may pop up, where you can choose whether other machines
+may access your hledger web interface.
+
+		</td>
+	</tr>
+</table>
+<br>
+
+
diff --git a/site/site.tmpl b/site/site.tmpl
index 3d3738ab1..3466269d7 100644
--- a/site/site.tmpl
+++ b/site/site.tmpl
@@ -20,7 +20,7 @@
     </div>
     <div id="navigation">
       <a href="$root/README.html">Home</a>
-      <a href="$root/binaries/">Download</a>
+      <a href="$root/download/">Download</a>
       <a href="$root/README2.html">Development</a>
       <a href="$root/MANUAL.html">Manual</a>
       <a href="$root/NEWS.html">News</a>
