diff --git a/CHANGELOG.md b/CHANGELOG.md
index 488a9814e6..20ee43ff2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,220 @@
+Changes in [0.8.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.7-rc.1) (2017-04-07)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6...v0.8.7-rc.1)
+
+ * Add support for using indexeddb in a webworker
+ [\#792](https://github.com/matrix-org/matrix-react-sdk/pull/792)
+ * Fix infinite pagination/glitches with pagination
+ [\#795](https://github.com/matrix-org/matrix-react-sdk/pull/795)
+ * Fix issue where teamTokenMap was ignored for guests
+ [\#793](https://github.com/matrix-org/matrix-react-sdk/pull/793)
+ * Click emote sender -> insert display name into composer
+ [\#791](https://github.com/matrix-org/matrix-react-sdk/pull/791)
+ * Fix scroll token selection logic
+ [\#785](https://github.com/matrix-org/matrix-react-sdk/pull/785)
+ * Replace sdkReady with firstSyncPromise, add mx_last_room_id
+ [\#790](https://github.com/matrix-org/matrix-react-sdk/pull/790)
+ * Change "Unread messages." to "Jump to first unread message."
+ [\#789](https://github.com/matrix-org/matrix-react-sdk/pull/789)
+ * Update for new IndexedDBStore interface
+ [\#786](https://github.com/matrix-org/matrix-react-sdk/pull/786)
+ * Add
to allowed attributes list
+ [\#787](https://github.com/matrix-org/matrix-react-sdk/pull/787)
+ * Fix the onFinished for timeline pos dialog
+ [\#784](https://github.com/matrix-org/matrix-react-sdk/pull/784)
+ * Only join a room when enter is hit if the join button is shown
+ [\#776](https://github.com/matrix-org/matrix-react-sdk/pull/776)
+ * Remove non-functional session load error
+ [\#783](https://github.com/matrix-org/matrix-react-sdk/pull/783)
+ * Use Login & Register via component interface
+ [\#782](https://github.com/matrix-org/matrix-react-sdk/pull/782)
+ * Attempt to fix the flakyness seen with tests
+ [\#781](https://github.com/matrix-org/matrix-react-sdk/pull/781)
+ * Remove React warning
+ [\#780](https://github.com/matrix-org/matrix-react-sdk/pull/780)
+ * Only clear the local notification count if needed
+ [\#779](https://github.com/matrix-org/matrix-react-sdk/pull/779)
+ * Don't re-notify about messages on browser refresh
+ [\#777](https://github.com/matrix-org/matrix-react-sdk/pull/777)
+ * Improve zeroing of RoomList notification badges
+ [\#775](https://github.com/matrix-org/matrix-react-sdk/pull/775)
+ * Fix VOIP bar hidden on first render of RoomStatusBar
+ [\#774](https://github.com/matrix-org/matrix-react-sdk/pull/774)
+ * Correct confirm prompt for disinvite
+ [\#772](https://github.com/matrix-org/matrix-react-sdk/pull/772)
+ * Add state loggingIn to MatrixChat to fix flashing login
+ [\#773](https://github.com/matrix-org/matrix-react-sdk/pull/773)
+ * Fix bug where you can't invite a valid address
+ [\#771](https://github.com/matrix-org/matrix-react-sdk/pull/771)
+ * Fix people section DropTarget and refactor Rooms
+ [\#761](https://github.com/matrix-org/matrix-react-sdk/pull/761)
+ * Read Receipt offset
+ [\#770](https://github.com/matrix-org/matrix-react-sdk/pull/770)
+ * Support adding phone numbers in UserSettings
+ [\#756](https://github.com/matrix-org/matrix-react-sdk/pull/756)
+ * Prevent crash on login of no guest session
+ [\#769](https://github.com/matrix-org/matrix-react-sdk/pull/769)
+ * Add canResetTimeline callback and thread it through to TimelinePanel
+ [\#768](https://github.com/matrix-org/matrix-react-sdk/pull/768)
+ * Show spinner whilst processing recaptcha response
+ [\#767](https://github.com/matrix-org/matrix-react-sdk/pull/767)
+ * Login / registration with phone number, mark 2
+ [\#750](https://github.com/matrix-org/matrix-react-sdk/pull/750)
+ * Display threepids slightly prettier
+ [\#758](https://github.com/matrix-org/matrix-react-sdk/pull/758)
+ * Fix extraneous leading space in sent emotes
+ [\#764](https://github.com/matrix-org/matrix-react-sdk/pull/764)
+ * Add ConfirmRedactDialog component
+ [\#763](https://github.com/matrix-org/matrix-react-sdk/pull/763)
+ * Fix password UI auth test
+ [\#760](https://github.com/matrix-org/matrix-react-sdk/pull/760)
+ * Display timestamps and profiles for redacted events
+ [\#759](https://github.com/matrix-org/matrix-react-sdk/pull/759)
+ * Fix UDD for voip in e2e rooms
+ [\#757](https://github.com/matrix-org/matrix-react-sdk/pull/757)
+ * Add "Export E2E keys" option to logout dialog
+ [\#755](https://github.com/matrix-org/matrix-react-sdk/pull/755)
+ * Fix People section a bit
+ [\#754](https://github.com/matrix-org/matrix-react-sdk/pull/754)
+ * Do routing to /register _onLoadCompleted
+ [\#753](https://github.com/matrix-org/matrix-react-sdk/pull/753)
+ * Double UNPAGINATION_PADDING again
+ [\#747](https://github.com/matrix-org/matrix-react-sdk/pull/747)
+ * Add null check to start_login
+ [\#751](https://github.com/matrix-org/matrix-react-sdk/pull/751)
+ * Merge the two RoomTile context menus into one
+ [\#746](https://github.com/matrix-org/matrix-react-sdk/pull/746)
+ * Fix import for Lifecycle
+ [\#748](https://github.com/matrix-org/matrix-react-sdk/pull/748)
+ * Make UDD appear when UDE on uploading a file
+ [\#745](https://github.com/matrix-org/matrix-react-sdk/pull/745)
+ * Decide on which screen to show after login in one place
+ [\#743](https://github.com/matrix-org/matrix-react-sdk/pull/743)
+ * Add onClick to permalinks to route within Riot
+ [\#744](https://github.com/matrix-org/matrix-react-sdk/pull/744)
+ * Add support for pasting files into the text box
+ [\#605](https://github.com/matrix-org/matrix-react-sdk/pull/605)
+ * Show message redactions as black event tiles
+ [\#739](https://github.com/matrix-org/matrix-react-sdk/pull/739)
+ * Allow user to choose from existing DMs on new chat
+ [\#736](https://github.com/matrix-org/matrix-react-sdk/pull/736)
+ * Fix the team server registration
+ [\#741](https://github.com/matrix-org/matrix-react-sdk/pull/741)
+ * Clarify "No devices" message
+ [\#740](https://github.com/matrix-org/matrix-react-sdk/pull/740)
+ * Change timestamp permalinks to matrix.to
+ [\#735](https://github.com/matrix-org/matrix-react-sdk/pull/735)
+ * Fix resend bar and "send anyway" in UDD
+ [\#734](https://github.com/matrix-org/matrix-react-sdk/pull/734)
+ * Make COLOR_REGEX stricter
+ [\#737](https://github.com/matrix-org/matrix-react-sdk/pull/737)
+ * Port registration over to use InteractiveAuth
+ [\#729](https://github.com/matrix-org/matrix-react-sdk/pull/729)
+ * Test to see how fuse feels
+ [\#732](https://github.com/matrix-org/matrix-react-sdk/pull/732)
+ * Submit a new display name on blur of input field
+ [\#733](https://github.com/matrix-org/matrix-react-sdk/pull/733)
+ * Allow [bf]g colors for style attrib
+ [\#610](https://github.com/matrix-org/matrix-react-sdk/pull/610)
+ * MELS: either expanded or summary, not both
+ [\#683](https://github.com/matrix-org/matrix-react-sdk/pull/683)
+ * Autoplay videos and GIFs if enabled by the user.
+ [\#730](https://github.com/matrix-org/matrix-react-sdk/pull/730)
+ * Warn users about using e2e for the first time
+ [\#731](https://github.com/matrix-org/matrix-react-sdk/pull/731)
+ * Show UDDialog on UDE during VoIP calls
+ [\#721](https://github.com/matrix-org/matrix-react-sdk/pull/721)
+ * Notify MatrixChat of teamToken after login
+ [\#726](https://github.com/matrix-org/matrix-react-sdk/pull/726)
+ * Fix a couple of issues with RRs
+ [\#727](https://github.com/matrix-org/matrix-react-sdk/pull/727)
+ * Do not push a dummy element with a scroll token for invisible events
+ [\#718](https://github.com/matrix-org/matrix-react-sdk/pull/718)
+ * MELS: check scroll on load + use mels-1,-2,... key
+ [\#715](https://github.com/matrix-org/matrix-react-sdk/pull/715)
+ * Fix message composer placeholders
+ [\#723](https://github.com/matrix-org/matrix-react-sdk/pull/723)
+ * Clarify non-e2e vs. e2e /w composers placeholder
+ [\#720](https://github.com/matrix-org/matrix-react-sdk/pull/720)
+ * Fix status bar expanded on tab-complete
+ [\#722](https://github.com/matrix-org/matrix-react-sdk/pull/722)
+ * add .editorconfig
+ [\#713](https://github.com/matrix-org/matrix-react-sdk/pull/713)
+ * Change the name of the database
+ [\#719](https://github.com/matrix-org/matrix-react-sdk/pull/719)
+ * Allow setting the default HS from the query parameter
+ [\#716](https://github.com/matrix-org/matrix-react-sdk/pull/716)
+ * first cut of improving UX for deleting devices.
+ [\#717](https://github.com/matrix-org/matrix-react-sdk/pull/717)
+ * Fix block quotes all being on a single line
+ [\#711](https://github.com/matrix-org/matrix-react-sdk/pull/711)
+ * Support reasons for kick / ban
+ [\#710](https://github.com/matrix-org/matrix-react-sdk/pull/710)
+ * Show when you've been kicked or banned
+ [\#709](https://github.com/matrix-org/matrix-react-sdk/pull/709)
+ * Add a 'Clear Cache' button
+ [\#708](https://github.com/matrix-org/matrix-react-sdk/pull/708)
+ * Update the room view on room name change
+ [\#707](https://github.com/matrix-org/matrix-react-sdk/pull/707)
+ * Add a button to un-ban users in RoomSettings
+ [\#698](https://github.com/matrix-org/matrix-react-sdk/pull/698)
+ * Use IndexedDBStore from the JS-SDK
+ [\#687](https://github.com/matrix-org/matrix-react-sdk/pull/687)
+ * Make UserSettings use the right teamToken
+ [\#706](https://github.com/matrix-org/matrix-react-sdk/pull/706)
+ * If the home page is somehow accessed, goto directory
+ [\#705](https://github.com/matrix-org/matrix-react-sdk/pull/705)
+ * Display avatar initials in typing notifications
+ [\#699](https://github.com/matrix-org/matrix-react-sdk/pull/699)
+ * fix eslint's no-invalid-this rule for class properties
+ [\#703](https://github.com/matrix-org/matrix-react-sdk/pull/703)
+ * If a referrer hasn't been specified, use empty string
+ [\#701](https://github.com/matrix-org/matrix-react-sdk/pull/701)
+ * Don't force-logout the user if reading localstorage fails
+ [\#700](https://github.com/matrix-org/matrix-react-sdk/pull/700)
+ * Convert some missed buttons to AccessibleButton
+ [\#697](https://github.com/matrix-org/matrix-react-sdk/pull/697)
+ * Make ban either ban or unban
+ [\#696](https://github.com/matrix-org/matrix-react-sdk/pull/696)
+ * Add confirmation dialog to kick/ban buttons
+ [\#694](https://github.com/matrix-org/matrix-react-sdk/pull/694)
+ * Fix typo with Scalar popup
+ [\#695](https://github.com/matrix-org/matrix-react-sdk/pull/695)
+ * Treat the literal team token string "undefined" as undefined
+ [\#693](https://github.com/matrix-org/matrix-react-sdk/pull/693)
+ * Store retrieved sid in the signupInstance of EmailIdentityStage
+ [\#692](https://github.com/matrix-org/matrix-react-sdk/pull/692)
+ * Split out InterActiveAuthDialog
+ [\#691](https://github.com/matrix-org/matrix-react-sdk/pull/691)
+ * View /home on registered /w team
+ [\#689](https://github.com/matrix-org/matrix-react-sdk/pull/689)
+ * Instead of sending userId, userEmail, send sid, client_secret
+ [\#688](https://github.com/matrix-org/matrix-react-sdk/pull/688)
+ * Enable branded URLs again by parsing the path client-side
+ [\#686](https://github.com/matrix-org/matrix-react-sdk/pull/686)
+ * Use new method of getting team icon
+ [\#680](https://github.com/matrix-org/matrix-react-sdk/pull/680)
+ * Persist query parameter team token across refreshes
+ [\#685](https://github.com/matrix-org/matrix-react-sdk/pull/685)
+ * Thread teamToken through to LeftPanel for "Home" button
+ [\#684](https://github.com/matrix-org/matrix-react-sdk/pull/684)
+ * Fix typing notif and status bar
+ [\#682](https://github.com/matrix-org/matrix-react-sdk/pull/682)
+ * Consider emails ending in matrix.org as a uni email
+ [\#681](https://github.com/matrix-org/matrix-react-sdk/pull/681)
+ * Set referrer qp in nextLink
+ [\#679](https://github.com/matrix-org/matrix-react-sdk/pull/679)
+ * Do not set team_token if not returned by RTS on login
+ [\#678](https://github.com/matrix-org/matrix-react-sdk/pull/678)
+ * Get team_token from the RTS on login
+ [\#676](https://github.com/matrix-org/matrix-react-sdk/pull/676)
+ * Quick and dirty support for custom welcome pages
+ [\#550](https://github.com/matrix-org/matrix-react-sdk/pull/550)
+ * RTS Welcome Pages
+ [\#666](https://github.com/matrix-org/matrix-react-sdk/pull/666)
+ * Logging to try to track down riot-web#3148
+ [\#677](https://github.com/matrix-org/matrix-react-sdk/pull/677)
+
Changes in [0.8.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6) (2017-02-04)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.3...v0.8.6)