diff --git a/History.markdown b/History.markdown
index 9dd3a896..ad060fff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,17 @@
 ## HEAD
 
+### Major Enhancements
+
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.0.0 / 2014-05-06
+
 ### Major Enhancements
   * Add "Collections" feature (#2199)
   * Add gem-based plugin whitelist to safe mode (#1657)
diff --git a/site/docs/history.md b/site/docs/history.md
index 87b13d41..ef817e11 100644
--- a/site/docs/history.md
+++ b/site/docs/history.md
@@ -5,6 +5,233 @@ permalink: "/docs/history/"
 prev_section: contributing
 ---
 
+## 2.0.0 / 2014-05-06
+
+### Major Enhancements
+- Add "Collections" feature ([#2199]({{ site.repository }}/issues/2199))
+- Add gem-based plugin whitelist to safe mode ([#1657]({{ site.repository }}/issues/1657))
+- Replace the commander command line parser with a more robust
+    solution for our needs called `mercenary` ([#1706]({{ site.repository }}/issues/1706))
+- Remove support for Ruby 1.8.x ([#1780]({{ site.repository }}/issues/1780))
+- Move to jekyll/jekyll from mojombo/jekyll ([#1817]({{ site.repository }}/issues/1817))
+- Allow custom markdown processors ([#1872]({{ site.repository }}/issues/1872))
+- Provide support for the Rouge syntax highlighter ([#1859]({{ site.repository }}/issues/1859))
+- Provide support for Sass ([#1932]({{ site.repository }}/issues/1932))
+- Provide a 300% improvement when generating sites that use
+    `Post#next` or `Post#previous` ([#1983]({{ site.repository }}/issues/1983))
+- Provide support for CoffeeScript ([#1991]({{ site.repository }}/issues/1991))
+- Replace Maruku with Kramdown as Default Markdown Processor ([#1988]({{ site.repository }}/issues/1988))
+- Expose `site.static_files` to Liquid ([#2075]({{ site.repository }}/issues/2075))
+- Complete redesign of the template site generated by `jekyll new` ([#2050]({{ site.repository }}/issues/2050))
+- Update Listen from 1.x to 2.x ([#2097]({{ site.repository }}/issues/2097))
+- Front-matter defaults ([#2205]({{ site.repository }}/issues/2205))
+- Deprecate `relative_permalinks` configuration option (default to `false`) ([#2307]({{ site.repository }}/issues/2307))
+- Exclude files based on prefix as well as `fnmatch?` ([#2303]({{ site.repository }}/issues/2303))
+
+### Minor Enhancements
+- Move the EntryFilter class into the Jekyll module to avoid polluting the
+    global namespace ([#1800]({{ site.repository }}/issues/1800))
+- Add `group_by` Liquid filter create lists of items grouped by a common
+    property's value ([#1788]({{ site.repository }}/issues/1788))
+- Add support for Maruku's `fenced_code_blocks` option ([#1799]({{ site.repository }}/issues/1799))
+- Update Redcarpet dependency to ~> 3.0 ([#1815]({{ site.repository }}/issues/1815))
+- Automatically sort all pages by name ([#1848]({{ site.repository }}/issues/1848))
+- Better error message when time is not parseable ([#1847]({{ site.repository }}/issues/1847))
+- Allow `include` tag variable arguments to use filters ([#1841]({{ site.repository }}/issues/1841))
+- `post_url` tag should raise `ArgumentError` for invalid name ([#1825]({{ site.repository }}/issues/1825))
+- Bump dependency `mercenary` to `~> 0.2.0` ([#1879]({{ site.repository }}/issues/1879))
+- Bump dependency `safe_yaml` to `~> 1.0` ([#1886]({{ site.repository }}/issues/1886))
+- Allow sorting of content by custom properties ([#1849]({{ site.repository }}/issues/1849))
+- Add `--quiet` flag to silence output during build and serve ([#1898]({{ site.repository }}/issues/1898))
+- Add a `where` filter to filter arrays based on a key/value pair
+    ([#1875]({{ site.repository }}/issues/1875))
+- Route 404 errors to a custom 404 page in development ([#1899]({{ site.repository }}/issues/1899))
+- Excludes are now relative to the site source ([#1916]({{ site.repository }}/issues/1916))
+- Bring MIME Types file for `jekyll serve` to complete parity with GH Pages
+    servers ([#1993]({{ site.repository }}/issues/1993))
+- Adding Breakpoint to make new site template more responsive ([#2038]({{ site.repository }}/issues/2038))
+- Default to using the UTF-8 encoding when reading files. ([#2031]({{ site.repository }}/issues/2031))
+- Update Redcarpet dependency to ~> 3.1 ([#2044]({{ site.repository }}/issues/2044))
+- Remove support for Ruby 1.9.2 ([#2045]({{ site.repository }}/issues/2045))
+- Add `.mkdown` as valid Markdown extension ([#2048]({{ site.repository }}/issues/2048))
+- Add `index.xml` to the list of WEBrick directory index files ([#2041]({{ site.repository }}/issues/2041))
+- Make the `layouts` config key relative to CWD or to source ([#2058]({{ site.repository }}/issues/2058))
+- Update Kramdown to `~> 1.3` ([#1894]({{ site.repository }}/issues/1894))
+- Remove unnecessary references to `self` ([#2090]({{ site.repository }}/issues/2090))
+- Update to Mercenary v0.3.x ([#2085]({{ site.repository }}/issues/2085))
+- Ship Sass support as a separate gem ([#2098]({{ site.repository }}/issues/2098))
+- Extract core extensions into a Utils module ([#2112]({{ site.repository }}/issues/2112))
+- Refactor CLI & Commands For Greater Happiness ([#2143]({{ site.repository }}/issues/2143))
+- Provide useful error when Pygments returns `nil` and error out ([#2148]({{ site.repository }}/issues/2148))
+- Add support for unpublished drafts ([#2164]({{ site.repository }}/issues/2164))
+- Add `force_polling` option to the `serve` command ([#2165]({{ site.repository }}/issues/2165))
+- Clean up the `<head>` in the site template ([#2186]({{ site.repository }}/issues/2186))
+- Permit YAML blocks to end with three dots to better conform with the
+    YAML spec ([#2110]({{ site.repository }}/issues/2110))
+- Use `File.exist?` instead of deprecated `File.exists?` ([#2214]({{ site.repository }}/issues/2214))
+- Require newline after start of YAML front-matter header ([#2211]({{ site.repository }}/issues/2211))
+- Add the ability for pages to be marked as `published: false` ([#1492]({{ site.repository }}/issues/1492))
+- Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
+    looking up of variable values in a Liquid context. ([#2253]({{ site.repository }}/issues/2253))
+- Remove literal lang name from class ([#2292]({{ site.repository }}/issues/2292))
+- Return `utf-8` encoding in header for  webrick error page response ([#2289]({{ site.repository }}/issues/2289))
+- Make template site easier to customize ([#2268]({{ site.repository }}/issues/2268))
+- Add two-digit year to permalink template option ([#2301]({{ site.repository }}/issues/2301))
+- Add `site.documents` to Liquid payload (list of all docs) ([#2295]({{ site.repository }}/issues/2295))
+- Take into account missing values in the Liquid sort filter ([#2299]({{ site.repository }}/issues/2299))
+
+### Bug Fixes
+- Don't allow nil entries when loading posts ([#1796]({{ site.repository }}/issues/1796))
+- Remove the scrollbar that's always displayed in new sites generated
+    from the site template ([#1805]({{ site.repository }}/issues/1805))
+- Add `#path` to required methods in `Jekyll::Convertible` ([#1866]({{ site.repository }}/issues/1866))
+- Default Maruku fenced code blocks to ON for 2.0.0-dev ([#1831]({{ site.repository }}/issues/1831))
+- Change short opts for host and port for `jekyll docs` to be consistent with
+    other subcommands ([#1877]({{ site.repository }}/issues/1877))
+- Fix typos ([#1910]({{ site.repository }}/issues/1910))
+- Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 ([#1958]({{ site.repository }}/issues/1958))
+- Fixes full path leak to source directory when using include tag ([#1951]({{ site.repository }}/issues/1951))
+- Don't generate pages that aren't being published ([#1931]({{ site.repository }}/issues/1931))
+- Use `SafeYAML.load` to avoid conflicts with other projects ([#1982]({{ site.repository }}/issues/1982))
+- Relative posts should never fail to build ([#1976]({{ site.repository }}/issues/1976))
+- Remove executable bits of non executable files ([#2056]({{ site.repository }}/issues/2056))
+- `#path` for a draft is now `_drafts` instead of `_posts` ([#2042]({{ site.repository }}/issues/2042))
+- Patch a couple show-stopping security vulnerabilities ([#1946]({{ site.repository }}/issues/1946))
+- Sanitize paths uniformly, in a Windows-friendly way ([#2065]({{ site.repository }}/issues/2065), [#2109]({{ site.repository }}/issues/2109))
+- Update gem build steps to work correctly on Windows ([#2118]({{ site.repository }}/issues/2118))
+- Remove obsolete `normalize_options` method call from `bin/jekyll` ([#2121]({{ site.repository }}/issues/2121)).
+- Remove `+` characters from Pygments lexer names when adding as a CSS
+    class ([#994]({{ site.repository }}/issues/994))
+- Remove some code that caused Ruby interpreter warnings ([#2178]({{ site.repository }}/issues/2178))
+- Only strip the drive name if it begins the string ([#2175]({{ site.repository }}/issues/2175))
+- Remove default post with invalid date from site template ([#2200]({{ site.repository }}/issues/2200))
+- Fix `Post#url` and `Page#url` escape ([#1568]({{ site.repository }}/issues/1568))
+- Strip newlines from the {% raw %}`{% highlight %}`{% endraw %} block content ([#1823]({{ site.repository }}/issues/1823))
+- Load in `rouge` only when it's been requested as the highlighter ([#2189]({{ site.repository }}/issues/2189))
+- Convert input to string before XML escaping (`xml_escape` liquid filter) ([#2244]({{ site.repository }}/issues/2244))
+- Modify configuration key for Collections and reset properly. ([#2238]({{ site.repository }}/issues/2238))
+- Avoid duplicated output using `highlight` tag ([#2264]({{ site.repository }}/issues/2264))
+- Only use Jekyll.logger for output ([#2307]({{ site.repository }}/issues/2307))
+- Close the file descriptor in `has_yaml_header?` ([#2310]({{ site.repository }}/issues/2310))
+- Add `output` to `Document` liquid output hash ([#2309]({{ site.repository }}/issues/2309))
+
+### Development Fixes
+- Add a link to the site in the README.md file ([#1795]({{ site.repository }}/issues/1795))
+- Add in History and site changes from `v1-stable` branch ([#1836]({{ site.repository }}/issues/1836))
+- Testing additions on the Excerpt class ([#1893]({{ site.repository }}/issues/1893))
+- Fix the `highlight` tag feature ([#1859]({{ site.repository }}/issues/1859))
+- Test Jekyll under Ruby 2.1.0 ([#1900]({{ site.repository }}/issues/1900))
+- Add script/cibuild for fun and profit ([#1912]({{ site.repository }}/issues/1912))
+- Use `Forwardable` for delegation between `Excerpt` and `Post`
+    ([#1927]({{ site.repository }}/issues/1927))
+- Rename `read_things` to `read_content` ([#1928]({{ site.repository }}/issues/1928))
+- Add `script/branding` script for ASCII art lovin' ([#1936]({{ site.repository }}/issues/1936))
+- Update the README to reflect the repo move ([#1943]({{ site.repository }}/issues/1943))
+- Add the project vision to the README ([#1935]({{ site.repository }}/issues/1935))
+- Speed up Travis CI builds by using Rebund ([#1985]({{ site.repository }}/issues/1985))
+- Use Yarp as a Gem proxy for Travis CI ([#1984]({{ site.repository }}/issues/1984))
+- Remove Yarp as a Gem proxy for Travis CI ([#2004]({{ site.repository }}/issues/2004))
+- Move the reading of layouts into its own class ([#2020]({{ site.repository }}/issues/2020))
+- Test Sass import ([#2009]({{ site.repository }}/issues/2009))
+- Switch Maruku and Kramdown in lists of Runtime vs. Development dependencies ([#2049]({{ site.repository }}/issues/2049))
+- Clean up the gemspec for the project ([#2095]({{ site.repository }}/issues/2095))
+- Add Japanese translation of README and CONTRIBUTING docs. ([#2081]({{ site.repository }}/issues/2081))
+- Re-align the tables in Cucumber ([#2108]({{ site.repository }}/issues/2108))
+- Trim trailing spaces and convert tabs to spaces ([#2122]({{ site.repository }}/issues/2122))
+- Fix the failing Travis scenarios due to Cucumber issues ([#2155]({{ site.repository }}/issues/2155))
+- Wrap `bundle install` in `travis_retry` to retry when RubyGems fails ([#2160]({{ site.repository }}/issues/2160))
+- Refactor tags and categories ([#1639]({{ site.repository }}/issues/1639))
+- Extract plugin management into its own class ([#2197]({{ site.repository }}/issues/2197))
+- Add missing tests for `Command` ([#2216]({{ site.repository }}/issues/2216))
+- Update `rr` link in CONTRIBUTING doc ([#2247]({{ site.repository }}/issues/2247))
+- Streamline cucumber execution of `jekyll` subcommands ([#2258]({{ site.repository }}/issues/2258))
+- Refactor `Commands::Serve`. ([#2269]({{ site.repository }}/issues/2269))
+- Refactor `highlight` tag ([#2154]({{ site.repository }}/issues/2154))
+- Update `Util` hash functions with latest from Rails ([#2273]({{ site.repository }}/issues/2273))
+- Workaround for Travis bug ([#2290]({{ site.repository }}/issues/2290)) 
+
+### Site Enhancements
+- Document Kramdown's GFM parser option ([#1791]({{ site.repository }}/issues/1791))
+- Move CSS to includes & update normalize.css to v2.1.3 ([#1787]({{ site.repository }}/issues/1787))
+- Minify CSS only in production ([#1803]({{ site.repository }}/issues/1803))
+- Fix broken link to installation of Ruby on Mountain Lion blog post on
+    Troubleshooting docs page ([#1797]({{ site.repository }}/issues/1797))
+- Fix issues with 1.4.1 release blog post ([#1804]({{ site.repository }}/issues/1804))
+- Add note about deploying to OpenShift ([#1812]({{ site.repository }}/issues/1812))
+- Collect all Windows-related docs onto one page ([#1818]({{ site.repository }}/issues/1818))
+- Fixed typo in datafiles doc page ([#1854]({{ site.repository }}/issues/1854))
+- Clarify how to access `site` in docs ([#1864]({{ site.repository }}/issues/1864))
+- Add closing `<code>` tag to `context.registers[:site]` note ([#1867]({{ site.repository }}/issues/1867))
+- Fix link to [@mojombo](https://github.com/mojombo)'s site source ([#1897]({{ site.repository }}/issues/1897))
+- Add `paginate: nil` to default configuration in docs ([#1896]({{ site.repository }}/issues/1896))
+- Add link to our License in the site footer ([#1889]({{ site.repository }}/issues/1889))
+- Add a charset note in "Writing Posts" doc page ([#1902]({{ site.repository }}/issues/1902))
+- Disallow selection of path and prompt in bash examples
+- Add jekyll-compass to the plugin list ([#1923]({{ site.repository }}/issues/1923))
+- Add note in Posts docs about stripping `<p>` tags from excerpt ([#1933]({{ site.repository }}/issues/1933))
+- Add additional info about the new exclude behavior ([#1938]({{ site.repository }}/issues/1938))
+- Linkify 'awesome contributors' to point to the contributors graph on
+    GitHub ([#1940]({{ site.repository }}/issues/1940))
+- Update `docs/sites.md` link to GitHub Training materials ([#1949]({{ site.repository }}/issues/1949))
+- Update `master` with the release info from 1.4.3 ([#1947]({{ site.repository }}/issues/1947))
+- Define docs nav in datafile ([#1953]({{ site.repository }}/issues/1953))
+- Clarify the docs around the naming convention for posts ([#1971]({{ site.repository }}/issues/1971))
+- Add missing `next` and `previous` docs for post layouts and templates ([#1970]({{ site.repository }}/issues/1970))
+- Add note to `Writing posts` page about how to strip html from excerpt ([#1962]({{ site.repository }}/issues/1962))
+- Add `jekyll-humanize` plugin to plugin list ([#1998]({{ site.repository }}/issues/1998))
+- Add `jekyll-font-awesome` plugin to plugin list ([#1999]({{ site.repository }}/issues/1999))
+- Add `sublime-jekyll` to list of Editor plugins ([#2001]({{ site.repository }}/issues/2001))
+- Add `vim-jekyll` to the list of Editor plugins ([#2005]({{ site.repository }}/issues/2005))
+- Fix non-semantic nesting of `p` tags in `news_item` layout ([#2013]({{ site.repository }}/issues/2013))
+- Document destination folder cleaning ([#2016]({{ site.repository }}/issues/2016))
+- Updated instructions for NearlyFreeSpeech.NET installation ([#2015]({{ site.repository }}/issues/2015))
+- Update link to rack-jekyll on "Deployment Methods" page ([#2047]({{ site.repository }}/issues/2047))
+- Fix typo in /docs/configuration ([#2073]({{ site.repository }}/issues/2073))
+- Fix count in docs for `site.static_files` ([#2077]({{ site.repository }}/issues/2077))
+- Update configuration docs to indicate utf-8 is the default for 2.0.0
+    and ASCII for 1.9.3 ([#2074]({{ site.repository }}/issues/2074))
+- Add info about unreleased feature to the site ([#2061]({{ site.repository }}/issues/2061))
+- Add whitespace to liquid example in GitHub Pages docs ([#2084]({{ site.repository }}/issues/2084))
+- Clarify the way Sass and CoffeeScript files are read in and output ([#2067]({{ site.repository }}/issues/2067))
+- Add lyche gallery tag plugin link to list of plugins ([#2094]({{ site.repository }}/issues/2094))
+- Add Jekyll Pages Directory plugin to list of plugins ([#2096]({{ site.repository }}/issues/2096))
+- Update Configuration docs page with new markdown extension ([#2102]({{ site.repository }}/issues/2102))
+- Add `jekyll-image-set` to the list of third-party plugins ([#2105]({{ site.repository }}/issues/2105))
+- Losslessly compress images ([#2128]({{ site.repository }}/issues/2128))
+- Update normalize.css to 3.0.0 ([#2126]({{ site.repository }}/issues/2126))
+- Update modernizr to v2.7.1 ([#2129]({{ site.repository }}/issues/2129))
+- Add `jekyll-ordinal` to list of third-party plugins ([#2150]({{ site.repository }}/issues/2150))
+- Add `jekyll_figure` to list of third-party plugins ([#2158]({{ site.repository }}/issues/2158))
+- Clarify the documentation for safe mode ([#2163]({{ site.repository }}/issues/2163))
+- Some HTML tidying ([#2130]({{ site.repository }}/issues/2130))
+- Remove modernizr and use html5shiv.js directly for IE less than v9 ([#2131]({{ site.repository }}/issues/2131))
+- Remove unused images ([#2187]({{ site.repository }}/issues/2187))
+- Use `array_to_sentence_string` filter when outputting news item
+    categories ([#2191]({{ site.repository }}/issues/2191))
+- Add link to Help repo in primary navigation bar ([#2177]({{ site.repository }}/issues/2177))
+- Switch to using an ico file for the shortcut icon ([#2193]({{ site.repository }}/issues/2193))
+- Use numbers to specify font weights and only bring in font weights used ([#2185]({{ site.repository }}/issues/2185))
+- Add a link to the list of all tz database time zones ([#1824]({{ site.repository }}/issues/1824))
+- Clean-up and improve documentation `feed.xml` ([#2192]({{ site.repository }}/issues/2192))
+- Remove duplicate entry in list of third-party plugins ([#2206]({{ site.repository }}/issues/2206))
+- Reduce the whitespace in the favicon. ([#2213]({{ site.repository }}/issues/2213))
+- Add `jekyll-page-collections` to list of third-party plugins ([#2215]({{ site.repository }}/issues/2215))
+- Add a cross-reference about `post_url` ([#2243]({{ site.repository }}/issues/2243))
+- Add `jekyll-live-tiles` to list of third-party plugins ([#2250]({{ site.repository }}/issues/2250))
+- Fixed broken link to GitHub training material site source ([#2257]({{ site.repository }}/issues/2257))
+- Update link to help repo, now called `jekyll-help` ([#2277]({{ site.repository }}/issues/2277))
+- Fix capitalization of 'Jekyll' on Deployment Methods page ([#2291]({{ site.repository }}/issues/2291))
+- Include plugins by sonnym in list of third-party plugins ([#2297]({{ site.repository }}/issues/2297))
+- Add deprecated articles keeper filter to list of third-party plugins ([#2300]({{ site.repository }}/issues/2300))
+- Simplify and improve our CSS. ([#2127]({{ site.repository }}/issues/2127))
+- Use black text color for the mobile navbar ([#2306]({{ site.repository }}/issues/2306))
+- Use the built in date filter and `site.time` for the copyright year. ([#2305]({{ site.repository }}/issues/2305))
+- Update html5shiv to v3.7.2 ([#2304]({{ site.repository }}/issues/2304))
+- Add 2.0.0 release post ([#2298]({{ site.repository }}/issues/2298))
+- Add docs for custom markdown processors ([#2298]({{ site.repository }}/issues/2298))
+- Add docs for `where` and `group_by` Liquid filters ([#2298]({{ site.repository }}/issues/2298))
+- Remove notes in docs for unreleased features ([#2309]({{ site.repository }}/issues/2309))
+
 ## 1.5.1 / 2014-03-27
 
 ### Bug Fixes