diff --git a/doc/Makefile b/doc/Makefile
index b151ad751..0806c1777 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,6 +8,11 @@ OTHER= 3d.png choose-a-cyclist.png cpint.gp cpint.png critical-power-plot.png cr
        pm.png power.zones realtime.png ride-plot.png ride-plot2.png ride-summary.png sample.gp \
        sample.png weekly-summary.png google-earth.png aerolab.png
 
+BIN=    GoldenCheetah_2.0.0_Linux_x86_64.gz \
+        GoldenCheetah_2.0.0_Linux_x86.gz \
+        GoldenCheetah_2.0.0_Mac_Universal.dmg \
+        GoldenCheetah_2.0.0_Windows_Installer.exe
+
 all: $(HTML)
 .PHONY: all clean install
 
@@ -18,6 +23,10 @@ install:
 	rsync -avz -e ssh $(HTML) $(TARBALLS) $(OTHER) \
 		srhea.net:/home/srhea/wwwroot/goldencheetah.org/
 
+install-bin:
+	rsync -avz -e ssh $(BIN) \
+		srhea.net:/home/srhea/wwwroot/goldencheetah.org/
+
 bug-tracker.html: bug-tracker.content genpage.pl
 	./genpage.pl "Bug Tracker" $< > $@
 
diff --git a/doc/download.content b/doc/download.content
index 3a25884f6..23a2977dd 100644
--- a/doc/download.content
+++ b/doc/download.content
@@ -22,18 +22,18 @@ open source PL2303 driver</a> to download from an SRM.
 
 <p>
 <font face="arial,helvetica,sanserif">
-<big><strong>Download Release 1.3.0</strong></big>
+<big><strong>Download Release 2.0</strong></big>
 </font>
 
 <ul>
-<li><a href="GoldenCheetah_1.3.0_Linux_x86.gz">Linux x86</a><br>
-<li><a href="GoldenCheetah_1.3.0_Linux_x86_64.gz">Linux x86_64</a><br>
-<li><a href="GoldenCheetah_1.3.0_Mac_Universal.zip">Mac OS X Universal</a><br>
-<li><a href="GoldenCheetah_1.3.0_Windows_Installer.exe">Windows 32-bit</a>
+<li><a href="GoldenCheetah_2.0.0_Linux_x86.gz">Linux x86</a><br>
+<li><a href="GoldenCheetah_2.0.0_Linux_x86_64.gz">Linux x86_64</a><br>
+<li><a href="GoldenCheetah_2.0.0_Mac_Universal.dmg">Mac OS X Universal</a><br>
+<li><a href="GoldenCheetah_2.0.0_Windows_Installer.exe">Windows 32-bit</a>
 </ul>
 
 <p>
-You can also <a href="release-notes.html">view the release notes</a> for 1.3.0
+You can also <a href="release-notes.html">view the release notes</a> for 2.0
 or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 </p>
 
@@ -45,7 +45,7 @@ or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 <p>Gareth Coco has also made
 <a href="http://goldencheetah.stand2surf.net/">nightly development builds</a>
 available.  These binaries are based on the latest code, so they have more
-features and (sometimes) more bugs than the 1.3.0 release above.
+features and (sometimes) more bugs than the stable 2.0 release above.
 
 <p>
 <font face="arial,helvetica,sanserif">
diff --git a/doc/logo.jpg b/doc/logo.jpg
index 95fc52dcd..54954494b 100644
Binary files a/doc/logo.jpg and b/doc/logo.jpg differ
diff --git a/doc/logo.png b/doc/logo.png
index 0787910f6..f3ae5d75b 100644
Binary files a/doc/logo.png and b/doc/logo.png differ
diff --git a/doc/older-releases.content b/doc/older-releases.content
index 1bacc7c74..2af9d0bdb 100644
--- a/doc/older-releases.content
+++ b/doc/older-releases.content
@@ -18,6 +18,106 @@ please see <a href="download.html">the download page</a> instead.
 <td><i>Description</i></td>
 </tr>
 
+<tr>
+<td valign="top">1.3.0</td>
+<td valign="top">
+<a href="GoldenCheetah_1.3.0_Linux_x86.gz">Linux x86</a><br>
+<a href="GoldenCheetah_1.3.0_Linux_x86_64.gz">Linux x86_64</a><br>
+<a href="GoldenCheetah_1.3.0_Mac_Universal.zip">Mac OS X Universal</a><br>
+<a href="GoldenCheetah_1.3.0_Windows_Installer.exe">Windows 32-bit</a>
+</td>
+<td valign="top">
+<p>
+Lots of new features:
+<p>
+Realtime Mode:
+  <ul>
+  <li>Graph data as you ride (Mark Liversedge, Justin Knotzke, Steve Gribble)</li>
+  </ul>
+</p>
+
+<p>
+Charts:
+  <ul>
+  <li>Added Performance Manager (Eric Murray)</li>
+  <li>Added 3D Modeling (Mark Liversedge and Greg Steele)</li>
+  <li>Up to four y-axes on Ride Plot (Sean Rhea)</li>
+  <li>Option to show work instead of power in Critical Power Plot (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Intervals:
+  <ul>
+  <li>Configurable metrics for intervals (Sean Rhea)</li>
+  <li>Find peak powers and add to intervals (Mark Liversedge)</li>
+  <li>Highlight intervals in plots (Damien Grauser)</li>
+  </ul>
+</p>
+
+<p>
+Device support:
+  <ul>
+  <li>Serial port support on Windows (Mark Liversedge)</li>
+  <li>Erase SRM memory without downloading (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Imports:
+  <ul>
+  <li>New ride import wizard (Mark Liversedge, Jamie Kimberley)</li>
+  <li>Support Computrainer 3dp file format (Greg Lonnon)</li>
+  <li>Support WKO v3 file format (Mark Liversedge)</li>
+  <li>Support files with Garmin "smart recording" (Greg Lonnon)</li>
+  <li>New GoldenCheetah (.gc) file format (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+New/improved ride metrics:
+  <ul>
+  <li>Added Joe Friel's Aerobic Decoupling (Sean Rhea)</li>
+  <li>Added training points system by running coach Jack Daniels (Sean Rhea)</li>
+  <li>Better elevation gain estimates (Sean Rhea)</li>
+  </ul>
+</p>
+
+<p>
+Support for more languages:
+  <ul>
+  <li>French (Damien Grauser)</li>
+  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
+  </ul>
+</p>
+
+<p>
+Other new features:
+  <ul>
+  <li>Group rides into seasons (Justin Knotzke)</li>
+  <li>Better ride calendar (Berend De Schouwer)</li>
+  <li>Ride list pop-up menu (Thomas Weichmann)</li>
+  </ul>
+</p>
+
+</p>
+<ul>
+<li>Direct download from SRM (R. Clasen and S. Rhea)
+<li>WKO+ file import (M. Liversedge)
+<li>Qollector support (M. Rages)
+<li>Altitude plotting (T. Weichmann)
+<li>Manual ride entry (E. Murray)
+<li>Power zones shading (D. Connell)
+<li>Weekly summary histograms (R. Carlsen)
+<li>Automatic CP estimation from CP graph (D. Connell)
+<li>Support for running off a USB stick (J. Knotzke)
+<li>OS-specific directory layout (J. Simioni)
+<li>PF/PV plot improvements (B. de Schouwer)
+<li>Memory leak fixes (G. Lonnon)
+</ul>
+<p>Thanks also to Jamie Kimberley for extensive testing.
+</td>
+</tr>
 <tr>
 <td valign="top">1.2.0</td>
 <td valign="top">
diff --git a/doc/release-notes.content b/doc/release-notes.content
index 1eb60b068..41308c597 100644
--- a/doc/release-notes.content
+++ b/doc/release-notes.content
@@ -1,99 +1,81 @@
-
 <p>
 <font face="arial,helvetica,sanserif">
-<big><strong>GoldenCheetah 1.3</strong></big>
+<big><strong>GoldenCheetah 2.0</strong></big>
 </font>
+</p>
 
 <p>
-Realtime Mode:
+New Features
   <ul>
-  <li>Graph data as you ride (Mark Liversedge, Justin Knotzke, Steve Gribble)</li>
+  <li>Aerolab (Andy Froncioni)</li>
+  <li>View ride in Google Maps (Greg Lonnon)</li>
+  <li>Long Term Metrics (Mark Liversedge)</li>
+  <li>User configurable ride metadata (Mark Liversedge)</li>
+  <li>Ride editor and tools (Mark Liversedge)</li>
+  <li>HR Zones and TRIMP Metrics (Damien Grauser)</li>
+  <li>Twitter support (Justin Knotzke)</li>
   </ul>
 </p>
 
 <p>
-Charts:
+Internationalisation
   <ul>
-  <li>Added Performance Manager (Eric Murray)</li>
-  <li>Added 3D Modeling (Mark Liversedge and Greg Steele)</li>
-  <li>Up to four y-axes on Ride Plot (Sean Rhea)</li>
-  <li>Option to show work instead of power in Critical Power Plot (Sean Rhea)</li>
+  <li>Updates to French translation (Damien Grauser)</li>
+  <li>Japanese translation (Mitsukuni Sato)</li>
   </ul>
 </p>
 
 <p>
-Intervals:
+New Logo and Icons
   <ul>
-  <li>Configurable metrics for intervals (Sean Rhea)</li>
-  <li>Find peak powers and add to intervals (Mark Liversedge)</li>
-  <li>Highlight intervals in plots (Damien Grauser)</li>
+  <li>Golden Cheetah Logo(Dan Schmalz)</li>
   </ul>
 </p>
 
 <p>
-Device support:
+Enhanced Ride Plot
   <ul>
-  <li>Serial port support on Windows (Mark Liversedge)</li>
-  <li>Erase SRM memory without downloading (Sean Rhea)</li>
+  <li>Ride plot stacked view (Damien Grauser)</li>
+  <li>Scrolling Ride Plot (Mark Liversedge)</li>
   </ul>
 </p>
 
 <p>
-Imports:
+New Devices and File Formats Supported
   <ul>
-  <li>New ride import wizard (Mark Liversedge, Jamie Kimberley)</li>
-  <li>Support Computrainer 3dp file format (Greg Lonnon)</li>
-  <li>Support WKO v3 file format (Mark Liversedge)</li>
-  <li>Support files with Garmin "smart recording" (Greg Lonnon)</li>
-  <li>New GoldenCheetah (.gc) file format (Sean Rhea)</li>
+  <li>Support for Joule BIN File Format (Damien Grauser)</li>
+  <li>Tacx CAF Ride File Format Support (Ilja Booij)</li>
+  <li>Garmin FIT ride file support (Sean Rhea)</li>
+  <li>Export to Google Earth 5.2 KML (Mark Liversedge)</li>
+  <li>Training Peaks PWX ride file support (Mark Liversedge)</li>
+  <li>Polar SRD ride file support (Mark Liversedge)</li>
+  <li>Racermate CompCS/Ergvideo .TXT ride file support (Mark Liversedge)</li>
   </ul>
-</p>
+<p>
 
 <p>
-New/improved ride metrics:
+Numerous enhancements and bug fixes from
   <ul>
-  <li>Added Joe Friel's Aerobic Decoupling (Sean Rhea)</li>
-  <li>Added training points system by running coach Jack Daniels (Sean Rhea)</li>
-  <li>Better elevation gain estimates (Sean Rhea)</li>
-  </ul>
-</p>
-
-<p>
-Support for more languages:
-  <ul>
-  <li>French (Damien Grauser)</li>
-  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
-  </ul>
-</p>
-
-<p>
-Other new features:
-  <ul>
-  <li>Group rides into seasons (Justin Knotzke)</li>
-  <li>Better ride calendar (Berend De Schouwer)</li>
-  <li>Ride list pop-up menu (Thomas Weichmann)</li>
-  </ul>
-</p>
-
-<p>
-Lots of bug fixes by:
-  <ul>
-  <li>Rob Carlsen</li>
+  <li>Julian Baumgartner</li>
+  <li>Robert Carlsen</li>
   <li>Rainer Clasen</li>
-  <li>Chris Cleeland</li>
-  <li>Steve Gribble</li>
+  <li>Gareth Coco</li>
   <li>Dag Gruneau</li>
-  <li>Ned Harding</li>
   <li>Jamie Kimberley</li>
-  <li>Justin Knotzke</li>
-  <li>Mark Liversedge</li>
-  <li>Greg Lonnon</li>
-  <li>Eric Murray</li>
-  <li>Sean Rhea</li>
-  <li>Robb Romans</li>
-  <li>Berend De Schouwer</li>
-  <li>Julian Simioni</li>
+  <li>Jim Ley</li>
+  <li>Patrick J. McNerthney</li>
+  <li>Austin Roach</li>
+  <li>Ken Sallot</li>
   <li>Thomas Weichmann</li>
   </ul>
 </p>
 
+<p>
+Builds, testing and support
+  <ul>
+  <li>Robert Carlsen</li>
+  <li>Gareth Coco</li>
+  <li>Jamie Kimberley</li>
+  <li>Justin Knotzke</li>
+  </ul>
+</p>