diff --git a/doc/download/index.html b/doc/download/index.html
index f408a28d19..6138e69685 100644
--- a/doc/download/index.html
+++ b/doc/download/index.html
@@ -18,7 +18,7 @@
           href="http://feeds.feedburner.com/nodejs/123123123">
     <title>node.js</title>
   </head>
-  <body class="int">
+  <body class="int" id="download-page">
     <div id="intro" class="interior">
       <a href="/" title="Go back to the home page">
         <img id="logo" src="http://nodejs.org/images/logo.png" alt="node.js">
@@ -40,47 +40,93 @@
         <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p>
       </div>
       <div id="column1" class="interior row">
-        <p>
-          Download the Node.js source code or a pre-built installer for your platform, and start developing today.
-        </p>
-      </div>
-      <div id="column1" class="interior row">
-        <h2 id="installers" class="installers">Installers</h2>
-        <p>
-          To install Node.js and npm use the appropriate installer for your platform, or discover <a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">what's new</a> in <strong>Node.js __VERSION__</strong>.
-        </p>
-        <p>
-          <strong>Mac OS X Installer</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">32- and 64-bit (.pkg)</a><br />
-          <strong>Windows Installer</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">32-bit (.msi)</a> or 
-          <a href="http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x64.msi">64-bit (.msi)</a><br />
-          <strong>Linux Binaries</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x86.tar.gz">32-bit (.tar.gz)</a> or
-          <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x64.tar.gz">64-bit (.tar.gz)</a><br />
-          <strong>Solaris Binaries</strong>: <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x86.tar.gz">32-bit (.tar.gz)</a> or
-          <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x64.tar.gz">64-bit (.tar.gz)</a>
-        </p>
-        <p>
-          Alternatively, you can install Node.js using various <a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">package managers</a>.
-        </p>
-      </div>
-      <div id="column1" class="interior row">
-        <h2 id="apiDocumentationAndSourceCode">API Documentation and Source Code</h2>
-        <p>
-          If you are unsure about how to use Node.js, the <a href="http://nodejs.org/docs/__VERSION__/api/">API documentation</a> is there to help.
-        </p>
-        <p>
-          You can also have a look at the <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">source code</a>, or contribute to Node.js by
-          forking the <a href="https://github.com/joyent/node">GitHub repository</a> and creating pull requests.
-        </p>
-        <p>
-          There exist some <a href="http://nodejs.org/dist/__VERSION__">other release files</a> as well.
-        </p>
-      </div>
-      <div id="column1" class="interior row">
-        <h2 id="license">License</h2>
-        <p>
-          You may also be interested in the <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a> of Node.js.
-        </p>
+        <div class="interior row">
+          <p>
+            Download the Node.js source code or a pre-built installer for your platform, and start developing today.
+          </p>
+          <p>Current version: <b>__VERSION__</b></p>
+        </div>
+        <div class="interior row">
+          <ul id="installers" class="clearfix">
+            <li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">Windows Installer</a><br>node-__VERSION__-x86.msi</li>
+            <li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">Macintosh Installer</a><br>node-__VERSION__.pkg</li>
+            <li id="source"><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">Source Code</a><br>node-__VERSION__.tar.gz</li>
+          </ul>
+        </div>
+
+        <div class="interior row">
+          <h2 id="binaries" class="installers">Downloads</h2>
+          <p>
+            To install Node.js and npm use the appropriate installer for your platform, or discover <a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">what's new</a> in <strong>Node.js __VERSION__</strong>.
+          </p>
+
+          <table style="font-size:14px">
+            <tr>
+              <th>Windows Installer (.msi)</th>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">32-bit</a></td>
+              <td><a href="http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x64.msi">64-bit</a></td>
+            </tr>
+
+            <tr>
+              <th>Windows Binary (.exe)</th>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node.exe">32-bit</a></td>
+              <td><a href="http://nodejs.org/dist/__VERSION__/x64/node.exe">64-bit</a></td>
+            </tr>
+
+            <tr>
+              <th>Mac OS X Installer (.pkg)</th>
+              <td colspan=2><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">Universal</a></td>
+            </tr>
+
+            <tr>
+              <th>Mac OS X Binaries (.tar.gz)</strong></th>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-darwin-x86.tar.gz">32-bit</a></td>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-darwin-x64.tar.gz">64-bit</a></td>
+            </tr>
+
+            <tr>
+              <th>Linux Binaries (.tar.gz)</th>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x86.tar.gz">32-bit</a></td>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x64.tar.gz">64-bit</a></td>
+            </tr>
+
+            <tr>
+              <th>SunOS Binaries (.tar.gz)</th>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x86.tar.gz">32-bit</a></td>
+              <td><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x64.tar.gz">64-bit</a</td>
+            </tr>
+
+            <tr>
+              <th>Source Code</th>
+              <td colspan=2>
+                <a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">node-__VERSION__.tar.gz</a>
+              </td>
+            </tr>
+          </table>
+
+          <h2 style="margin-top:1em" id=other-info>Other Info</h2>
+          <ul>
+            <li><a href="http://nodejs.org/dist/__VERSION__/SHASUMS.txt">Shasums</a></li>
+            <li><a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">Change Log</a></li>
+
+            <li><a href="http://nodejs.org/docs/__VERSION__/api/">Documentation</a></li>
+
+            <li><a href="https://github.com/joyent/node">Git Repository</a></li>
+            <li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing from package managers</a>
+
+            <li><a href="http://nodejs.org/dist/__VERSION__">Other release files</a></li>
+        </ul>
+        </div>
+
+        <div class="interior row">
+          <h2 id="license">License</h2>
+          <p>
+            Node.js is released under the MIT
+            license, and bundles other liberally licensed OSS components.
+          <a
+            href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">Download the license</a></p>
+        </div>
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/doc/index.html b/doc/index.html
index d6be5e178d..2bb5ee9544 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -150,7 +150,8 @@ server.listen(1337, '127.0.0.1');</pre>
 
     <script type="text/javascript">
       if (location.hash === '#download') {
-        location.href = 'download/';
+        var n = location.href.replace(/(index.html)?#download/, 'download/$1')
+        location.replace(n);
       }
     </script>
 
diff --git a/doc/pipe.css b/doc/pipe.css
index f1db832384..7baefcf6a7 100644
--- a/doc/pipe.css
+++ b/doc/pipe.css
@@ -179,10 +179,81 @@ h1 a, h2 a, h3 a, h4 a
     float: left;
 }
 
-#content p {
+#content p,
+#content ul {
     font-size: 14px;
     line-height:24px;
 }
+
+#content ul {
+  margin-top:1em;
+}
+
+#content table {
+  font-size:14px;
+  line-height:24px;
+  width:100%;
+}
+
+
+
+#download-page ul#installers {
+  width: auto;
+  text-align: center;
+  margin: 0 auto;
+  background: url(http://nodejs.org/images/platform-icons.png) no-repeat center 20px white;
+  padding-top: 92px;
+  padding-bottom: 45px;
+  padding-left: 29px;
+}
+
+#download-page ul#installers li {
+  list-style-type: none;
+  width: 165px;
+  padding-left: 18px;
+  float: left;
+  display: block;
+  color: #33342D;
+  font-size: 10px;
+}
+
+#download-page ul#installers li#source {
+    padding-left: 0;
+}
+
+#download-page ul#installers li a {
+    font-size: 16px;
+    padding-top: 80px;
+    margin-top: -80px;
+}
+
+#download-page #content th {
+  text-align:left;
+  width:35%;
+}
+
+#download-page #content table {
+  table-collapse:separate;
+}
+
+#download-page #content td,
+#download-page #content th {
+  border:1px solid #666;
+}
+
+#download-page #content td a {
+  display:block;
+  height:100%;
+  width:100%;
+  text-align:center;
+}
+
+#download-page #content td a:hover,
+#download-page #content td a:active {
+  background:#666;
+  color: #8cc84b;
+}
+
 #front #content p {
   font-size:12px;
 }

Windows Installer (.msi)	32-bit	64-bit
Windows Binary (.exe)	32-bit	64-bit
Mac OS X Installer (.pkg)	Universal
Mac OS X Binaries (.tar.gz)	32-bit	64-bit
Linux Binaries (.tar.gz)	32-bit	64-bit
SunOS Binaries (.tar.gz)	32-bit	64-bit +
Source Code	+ node-__VERSION__.tar.gz +