diff --git a/History.markdown b/History.markdown
index 273193e6..13997d04 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements
 
@@ -137,9 +137,6 @@
   * add test to ensure variables work in `where_exp` condition (#5315)
   * Read explicitly included dot-files in collections. (#6092)
   * Default `baseurl` to `nil` instead of empty string (#6137)
-
-### fix
-
   * Filters#time helper: Duplicate time before calling #localtime. (#5996)
 
 ## 3.4.4 / 2016-06-17
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index c67f978a..de5dc4d8 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,159 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.5.0 / 2017-06-18
+{: #v3-5-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-5-0}
+
+- Upgrade to Liquid v4 ([#4362]({{ site.repository }}/issues/4362))
+- Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles ([#5871]({{ site.repository }}/issues/5871))
+- Add support for Tab-Separated Values data files (`*.tsv`) ([#5985]({{ site.repository }}/issues/5985))
+- Specify version constraint in subcommand error message. ([#5974]({{ site.repository }}/issues/5974))
+- Add a template for custom 404 page ([#5945]({{ site.repository }}/issues/5945))
+- Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file ([#5914]({{ site.repository }}/issues/5914))
+- Don't raise an error if URL contains a colon ([#5889]({{ site.repository }}/issues/5889))
+- Date filters should never raise an exception ([#5722]({{ site.repository }}/issues/5722))
+- add `plugins` config key as replacement for `gems` ([#5130]({{ site.repository }}/issues/5130))
+- create configuration from options only once in the boot process ([#5487]({{ site.repository }}/issues/5487))
+- Add option to fail a build with front matter syntax errors ([#5832]({{ site.repository }}/issues/5832))
+- Disable default layouts for documents with a `layout: none` declaration ([#5933]({{ site.repository }}/issues/5933))
+- In `jekyll new`, make copied site template user-writable ([#6072]({{ site.repository }}/issues/6072))
+- Add top-level `layout` liquid variable to Documents ([#6073]({{ site.repository }}/issues/6073))
+- Address reading non-binary static files in themes ([#5918]({{ site.repository }}/issues/5918))
+- Allow filters to sort & select based on subvalues ([#5622]({{ site.repository }}/issues/5622))
+- Add strip_index filter ([#6075]({{ site.repository }}/issues/6075))
+
+### Documentation
+
+- Install troubleshooting on Ubuntu ([#5817]({{ site.repository }}/issues/5817))
+- Add Termux section on troubleshooting ([#5837]({{ site.repository }}/issues/5837))
+- fix ial css classes in theme doc ([#5876]({{ site.repository }}/issues/5876))
+- Update installation.md ([#5880]({{ site.repository }}/issues/5880))
+- Update Aerobatic docs ([#5883]({{ site.repository }}/issues/5883))
+- Add note to collections doc on hard-coded collections. ([#5882]({{ site.repository }}/issues/5882))
+- Makes uri_escape template docs more specific. ([#5887]({{ site.repository }}/issues/5887))
+- Remove duplicate footnote_nr from default config ([#5891]({{ site.repository }}/issues/5891))
+- Fixed tutorial for publishing gem to include repo. ([#5900]({{ site.repository }}/issues/5900))
+- update broken links ([#5905]({{ site.repository }}/issues/5905))
+- Fix typo in contribution information ([#5910]({{ site.repository }}/issues/5910))
+- update plugin repo URL to reflect repo move ([#5916]({{ site.repository }}/issues/5916))
+- Update exclude array in configuration.md ([#5947]({{ site.repository }}/issues/5947))
+- Fixed path in "Improve this page" link in Tutorials section ([#5951]({{ site.repository }}/issues/5951))
+- Corrected permalink ([#5949]({{ site.repository }}/issues/5949))
+- Included more details about adding defaults to static files ([#5971]({{ site.repository }}/issues/5971))
+- Create buddyworks ([#5962]({{ site.repository }}/issues/5962))
+- added (buddyworks) to ci list ([#5965]({{ site.repository }}/issues/5965))
+- Add a tutorial on serving custom Error 404 page ([#5946]({{ site.repository }}/issues/5946))
+- add custom 404 to tutorial navigation ([#5978]({{ site.repository }}/issues/5978))
+- Add link to order of interpretation tutorial in Tutorials nav ([#5952]({{ site.repository }}/issues/5952))
+- Document Jekyll's Philosophy ([#5792]({{ site.repository }}/issues/5792))
+- Require Ruby > 2.1.0 ([#5983]({{ site.repository }}/issues/5983))
+- Fix broken link ([#5994]({{ site.repository }}/issues/5994))
+- Default options for script/proof ([#5995]({{ site.repository }}/issues/5995))
+- Mention Bash on Ubuntu on Windows ([#5960]({{ site.repository }}/issues/5960))
+- Document `--unpublished` flag introduced in 91e9ecf ([#5959]({{ site.repository }}/issues/5959))
+- Update upgrading.md to mention usage of `bundle update` ([#5604]({{ site.repository }}/issues/5604))
+- Fix missing quotation mark ([#6002]({{ site.repository }}/issues/6002))
+- New tutorial: Convert an HTML site to Jekyll ([#5881]({{ site.repository }}/issues/5881))
+- Revamp Permalink section ([#5912]({{ site.repository }}/issues/5912))
+- Fixup tutorial on creating theme from existing HTML templates ([#6006]({{ site.repository }}/issues/6006))
+- Standardise on "URLs" without apostrophe in docs ([#6018]({{ site.repository }}/issues/6018))
+- Added txtpen in tutorial ([#6021]({{ site.repository }}/issues/6021))
+- fix typo using past participle ([#6026]({{ site.repository }}/issues/6026))
+- changed formatting to fit the style of the documentation ([#6027]({{ site.repository }}/issues/6027))
+- doc fix typo word usage ([#6028]({{ site.repository }}/issues/6028))
+- corrected reference to layout in index.md ([#6032]({{ site.repository }}/issues/6032))
+- (Minor) Update MathJax CDN ([#6013]({{ site.repository }}/issues/6013))
+- Add MvvmCross to samples ([#6035]({{ site.repository }}/issues/6035))
+- Update travis-ci.md to correct procedure ([#6043]({{ site.repository }}/issues/6043))
+- fix sentence in documentation ([#6048]({{ site.repository }}/issues/6048))
+- rephrase a sentence in posts.md to be more direct ([#6049]({{ site.repository }}/issues/6049))
+- Compress Website Sass output ([#6009]({{ site.repository }}/issues/6009))
+- doc correct spelling error ([#6050]({{ site.repository }}/issues/6050))
+- adjusted date-format in sitemap ([#6053]({{ site.repository }}/issues/6053))
+- Typo fix (welcomed change -> welcome change). ([#6070]({{ site.repository }}/issues/6070))
+- Fixed documentation inconsistency ([#6068]({{ site.repository }}/issues/6068))
+- Add own plugin -> Jekyll Brand Social Wall ([#6064]({{ site.repository }}/issues/6064))
+- Added plugin jekyll-analytics ([#6042]({{ site.repository }}/issues/6042))
+- Use more precise language when explaining links ([#6078]({{ site.repository }}/issues/6078))
+- Update plugins.md ([#6088]({{ site.repository }}/issues/6088))
+- windows 10 tutorial ([#6100]({{ site.repository }}/issues/6100))
+- Explain how to override theme styles ([#6107]({{ site.repository }}/issues/6107))
+- updated Bash on Ubuntu on Windows link in tutorial ([#6111]({{ site.repository }}/issues/6111))
+- Fix wording in `_docs/templates.md` links section ([#6114]({{ site.repository }}/issues/6114))
+- Update windows.md ([#6115]({{ site.repository }}/issues/6115))
+- Added windows to docs.yml ([#6109]({{ site.repository }}/issues/6109))
+- Be more specific on what to upload ([#6119]({{ site.repository }}/issues/6119))
+- Remove Blank Newlines from "Jekyll on Windows" Page ([#6126]({{ site.repository }}/issues/6126))
+- Link the troubleshooting page in the quickstart page ([#6134]({{ site.repository }}/issues/6134))
+- add documentation about the &[#34]({{ site.repository }}/issues/34);pinned&[#34]({{ site.repository }}/issues/34); label ([#6147]({{ site.repository }}/issues/6147))
+- docs(JekyllOnWindows): Add a new Installation way ([#6141]({{ site.repository }}/issues/6141))
+- corrected windows.md ([#6149]({{ site.repository }}/issues/6149))
+- Refine documentation for Windows ([#6153]({{ site.repository }}/issues/6153))
+
+### Development Fixes
+{: #development-fixes-v3-5-0}
+
+- [Rubocop] add missing comma ([#5835]({{ site.repository }}/issues/5835))
+- Appease classifier-reborn ([#5934]({{ site.repository }}/issues/5934))
+- Allow releases & development on `*-stable` branches ([#5926]({{ site.repository }}/issues/5926))
+- Add script/backport-pr ([#5925]({{ site.repository }}/issues/5925))
+- Prefer .yaml over .toml ([#5966]({{ site.repository }}/issues/5966))
+- Fix Appveyor with DST-aware cucumber steps ([#5961]({{ site.repository }}/issues/5961))
+- Use Rubocop v0.47.1 till we're ready for v0.48 ([#5989]({{ site.repository }}/issues/5989))
+- Test against Ruby 2.4.0 ([#5687]({{ site.repository }}/issues/5687))
+- rubocop: lib/jekyll/renderer.rb complexity fixes ([#5052]({{ site.repository }}/issues/5052))
+- Use yajl-ruby 1.2.2 (now with 2.4 support) ([#6007]({{ site.repository }}/issues/6007))
+- Bump Rubocop to v0.48 ([#5997]({{ site.repository }}/issues/5997))
+- doc use example.com ([#6031]({{ site.repository }}/issues/6031))
+- fix typo ([#6040]({{ site.repository }}/issues/6040))
+- Fix CI  ([#6044]({{ site.repository }}/issues/6044))
+- Remove `ruby RUBY_VERSION` from generated Gemfile ([#5803]({{ site.repository }}/issues/5803))
+- Test if hidden collections output a document with a future date ([#6103]({{ site.repository }}/issues/6103))
+- Add test for uri_escape on reserved characters ([#6086]({{ site.repository }}/issues/6086))
+- Allow you to specify the rouge version via an environment variable for testing ([#6138]({{ site.repository }}/issues/6138))
+- Bump Rubocop to 0.49.1 ([#6093]({{ site.repository }}/issues/6093))
+- Lock nokogiri to 1.7.x for Ruby 2.1 ([#6140]({{ site.repository }}/issues/6140))
+
+### Site Enhancements
+{: #site-enhancements-v3-5-0}
+
+- Corrected date for version 3.4.0 ([#5842]({{ site.repository }}/issues/5842))
+- Add the correct year to the 3.4.0 release date ([#5858]({{ site.repository }}/issues/5858))
+- Add documentation about order of interpretation ([#5834]({{ site.repository }}/issues/5834))
+- Documentation on how to build navigation ([#5698]({{ site.repository }}/issues/5698))
+- Navigation has been moved out from docs ([#5927]({{ site.repository }}/issues/5927))
+- Make links in sidebar for current page more prominent ([#5820]({{ site.repository }}/issues/5820))
+- Update normalize.css to v6.0.0 ([#6008]({{ site.repository }}/issues/6008))
+- Docs: rename `gems` to `plugins` ([#6082]({{ site.repository }}/issues/6082))
+- plugins -> gems ([#6110]({{ site.repository }}/issues/6110))
+- Document difference between cgi_escape and uri_escape [#5970]({{ site.repository }}/issues/5970) ([#6081]({{ site.repository }}/issues/6081))
+
+### Bug Fixes
+{: #bug-fixes-v3-5-0}
+
+- Exclude Gemfile by default ([#5860]({{ site.repository }}/issues/5860))
+- Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
+- Allow abbreviated post dates ([#5920]({{ site.repository }}/issues/5920))
+- Remove dependency on include from default about.md ([#5903]({{ site.repository }}/issues/5903))
+- Allow colons in `uri_escape` filter ([#5957]({{ site.repository }}/issues/5957))
+- Re-surface missing public methods in `Jekyll::Document` ([#5975]({{ site.repository }}/issues/5975))
+- absolute_url should not mangle URL if called more than once ([#5789]({{ site.repository }}/issues/5789))
+- patch URLFilters to prevent `//` ([#6058]({{ site.repository }}/issues/6058))
+- add test to ensure variables work in `where_exp` condition ([#5315]({{ site.repository }}/issues/5315))
+- Read explicitly included dot-files in collections. ([#6092]({{ site.repository }}/issues/6092))
+- Default `baseurl` to `nil` instead of empty string ([#6137]({{ site.repository }}/issues/6137))
+- Filters#time helper: Duplicate time before calling #localtime. ([#5996]({{ site.repository }}/issues/5996))
+
+
+## 3.4.4 / 2016-06-17
+{: #v3-4-4}
+
+- Backport [#6137]({{ site.repository }}/issues/6137) for v3.4.x: Default `baseurl` to `nil` instead of empty string ([#6146]({{ site.repository }}/issues/6146))
+
+
 ## 3.4.3 / 2017-03-21
 {: #v3-4-3}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 6cb9d3dd..1545d966 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.4.3
+3.5.0
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 23ea0c2c..0af816ca 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.4".freeze
+  VERSION = "3.5.0".freeze
 end