diff --git a/_less/screen.less b/_less/screen.less
index d2b32876..91ecedaa 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -1070,7 +1070,7 @@ h2 .rssicon{
 }
 .downloadbox div div{
 	display:block;
-	width:180px;
+	width:190px;
 	margin:10px 0;
 	text-align:left;
 }
diff --git a/_templates/download.html b/_templates/download.html
index 5db82690..887a1e52 100755
--- a/_templates/download.html
+++ b/_templates/download.html
@@ -10,8 +10,8 @@ id: download
   <div class="downloadbox">
     <p>{% translate downloados %}</p>
     <div>
-      <div id="download_windows"><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe">Windows (exe)</a> <small>~11MB</small></div>
-      <div><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win.zip">Windows (zip)</a> <small>~62MB</small></div>
+      <div><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe">Windows (32bit)</a> <small>~11MB</small></div>
+      <div id="download_windows"><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win64-setup.exe">Windows (64bit)</a> <small>~12MB</small></div>
       <div><img src="/img/os/med_ubuntu.svg" alt="ubuntu"> <a href="https://launchpad.net/~bitcoin/+archive/bitcoin">Ubuntu (PPA)</a> <small>~4MB</small></div>
     </div>
     <div>
@@ -33,14 +33,27 @@ id: download
   <p>{% translate notelicense %}</p>
 </div>
 <script type="text/javascript">
-var os='windows';
+var os='windows32';
 if(navigator.userAgent.indexOf('Mac')!=-1)var os='mac'
-if(navigator.userAgent.indexOf('Linux')!=-1)var os='ubuntu';
+else if(navigator.userAgent.indexOf('Linux')!=-1)var os='ubuntu';
+else if(navigator.userAgent.indexOf('WOW64')!=-1||navigator.userAgent.indexOf('Win64')!=-1)var os='windows64';
 var but=document.getElementById('downloadbutton');
-but.getElementsByTagName('IMG')[0].src='/img/but_'+os+'.svg';
 switch(os){
-case 'windows':but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe';break;
-case 'ubuntu':but.href='https://launchpad.net/~bitcoin/+archive/bitcoin';break;
-case 'mac':but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg';break;
+case 'windows64':
+  but.getElementsByTagName('IMG')[0].src='/img/but_windows.svg';
+  but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win64-setup.exe';
+break;
+case 'windows32':
+  but.getElementsByTagName('IMG')[0].src='/img/but_windows.svg';
+  but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe';
+break;
+case 'ubuntu':
+  but.getElementsByTagName('IMG')[0].src='/img/but_ubuntu.svg';
+  but.href='https://launchpad.net/~bitcoin/+archive/bitcoin';
+break;
+case 'mac':
+  but.getElementsByTagName('IMG')[0].src='/img/but_mac.svg';
+  but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg';
+break;
 }
 </script>