diff --git a/History.txt b/History.txt
index ceb169d12..67bf228e0 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,21 @@
+# Version 0.3.6
+
+Release date: 2010-03-22
+
+This is a maintainance release with minor bug fixes, should be
+drop in compatible.
+
+### Added
+
+* It's now possible to load in external drivers
+
+### Fixed
+
+* has_content? ignores whitespace
+* Trigger events when choosing radios and checking checkboxes under Selenium
+* Make Capybara.app totally optional when running without server
+* Changed fallback host so it matches the one set up by Rails' integration tests
+
 # Version 0.3.5
 
 Release date: 2010-02-26