diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f50c6834732dbc9c726096ac9ddba09fcfb167..af5feb80d8d819f9a3a4f2b702008b74be8da30c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,21 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v0.8.4 [TBD]
+## v0.8.5 [2019-07-12]
+
+### Added
+
+### Changed
+
+### Fixed
+
+## v0.8.4 [2019-04-12]
 
 ### Added
 - Added waiting areas, waiting for certain time or till transition opens
-- Improve realtime event handling, new tag in ini <event_realtime> with commit 292b8381
+- Improve realtime event handling, new tag in ini `<event_realtime>` with commit 292b8381
+- New type of doors `{ OPEN, CLOSE, TEMP_CLOSE }` !48  #307
+- Outsource some configurations from inifile to external xml files. !46   #302
 - Add new properties to doors #299, #295
 - Add new properties to sources !41 #298
 - Added homebrew [packages](https://github.com/JuPedSim/homebrew-jps/blob/master/README.md)
@@ -20,9 +30,22 @@ All notable changes to this project will be documented in this file.
 - Feature dynamic transitions, moving danger line !32
 
 ### Changed
+
+- Show statistics for crossings too. !43 #293
+- Crossing IDs don't have to be consecutive. !39
+- `jpscore` uses C++17.
+- Write door statistics  every 1000 frames. 284749ab2e6f3ed85dc40ad24e3579e92c7f7883  #309
+- Big TXT-files will be splited in 10MB files. !45  #308
+- Change `plain` format dded6083
 - Agents without any exits should not be deleted 67ce14cf
 
 ### Fixed
+
+- Continuous walls are splited. Write corrected geometry  #281
+- Doors on walls are not a problem anymore #282
+- Better handle wrong group id for sources
+- Better handle parameter id in inifile. #303
+- Floorfield router reacts better on events. #294
 - Windows path compatibility for JPSfire-module d14229f7
 - Several SegFaults related to agents without navigation lines (especially agents created by sources)
 - C++11 support for XCode fbb3038a