diff --git a/CHANGELOG.md b/CHANGELOG.md
index d930cbd1f77b64397ba78a78428062f63fcab29d..12297b3fe2837ba3d97705c5d713bd7d9f70e9dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 6.0.2
 
-| Released yyyy/mm/dd, [GitHub Release Link](https://github.com/ufz/ogs/releases/tag/6.0.2)
+| Release planned 2015/06/15, [GitHub Release Link](https://github.com/ufz/ogs/releases/tag/6.0.2)
 
 ## Release notes
 
@@ -9,14 +9,21 @@ The second release of ogs6 introduces Neumann boundary conditions and VTK result
 ### Features:
 
 - [Neumann boundary conditions](http://docs.opengeosys.org/docs/benchmarks/elliptic/groundwater-flow-neumann)
+- Implement mesh properties for storage of data fields. This also includes mapped values (e.g. based on material id) [PR #542](https://github.com/ufz/ogs/pull/542), [PR #644](https://github.com/ufz/ogs/pull/644), 
 - Refactored mesh property classes to [enable VTK output](https://github.com/ufz/ogs/pull/692)
+- Extended the available elements to quadratic (e.g. Quad8) based on generalized "element rules".  [#572](https://github.com/ufz/ogs/pull/572), [PR #656](https://github.com/ufz/ogs/pull/656), [PR #657](https://github.com/ufz/ogs/pull/657),
+- Extend computation of shape matrices to lower dimensional elements embedded in higher dimensional space [#655]((https://github.com/ufz/ogs/pull/655)
 - Builds with MinGW (GCC) on Windows, see [Developer Guide](http://docs.opengeosys.org/docs/devguide/getting-started/prerequisites) and the new MinGW platform instructions
 - [Cross-compiling for Windows with MXE on Mac OS](http://docs.opengeosys.org/docs/devguide/advanced/cross-compiling)
 - [Support for new cross-platform IDE CLion](http://docs.opengeosys.org/docs/devguide/development-workflows/development-ides#clion)
+- Add gradual refinement to the structured mesh generator [PR #539](https://github.com/ufz/ogs/pull/539)
 
 ### Fixes
 
 - Performance optimizations in VTK mesh conversion, [PR #695](https://github.com/ufz/ogs/pull/695)
+- Improve layered prism mesh construction
+- Fix a lot of warnings on gcc/clang/msvc compilers improving the code
+
 
 ### Infrastructure
 
@@ -32,11 +39,14 @@ The second release of ogs6 introduces Neumann boundary conditions and VTK result
 
 ### In development
 
+- Heterogeneous fields (for e.g. hydraulic conductivity parameters)
+- Octree data structures for fast searches
 - OGS#PETSc interface for parallel computing
 
 ### Planned
 
-- Parabolic solver
+- Parallelization scheme using PETSc library
+- Extending the linear elliptic solver to non-linear problems
 
 
 --------------------------------------------------------------------------------