diff --git a/ChangeLog b/ChangeLog
index ffd1559..e14d140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+* Thu Mar 10 2005 Marc Waeckerlin <marc@waeckerlin.org> - mrw-c++-2.0.0 (mrw)
+	- New feature: Automated function trace for GNU Compiler (gcc)
+	- Thread safety for mrw::StackTrace
+* Tue Feb 22 2005 Marc Waeckerlin <marc@waeckerlin.org> - mrw-c++-2.0.0 (mrw)
+	- New feature: Function Trace
+	- REMOVED:
+	   - All previousely deprecated (min, max)
+	   - Simple Trace
+	- Bugfix in mrw::Dir, now it is documented, tested and usable
+	- Note: the logging hierarchy for log4cxx stacktrace has been renamed
+	  from "libmrw" to "mrw.stacktrace", it is now similar to the naming
+	  in the new function tracer, which is "mrw.fntrace"
+	- Because it is time to get rid of deprecated things, The major
+	  version number has been increased.
 * Fri Feb 18 2005 Marc Waeckerlin <marc@waeckerlin.org> - mrw-c++-1.9.0 (mrw)
 	- Added a wrapper around libtdl, Dynamic Library Loading for C++
 	- New global functions ifelse ind standard extensions
diff --git a/NEWS b/NEWS
index f49ef14..3cec395 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+2005-03-05
+
+Really cool new feature: Automagic function trace: Don't change a
+single line in your code (if log4cxx is already configured), just use
+GNU gcc with option -finstrument functions, and link to
+libmrwfunctiontracelog4cxx!
+
+2005-02-23
+
+New feature: A Function Tracer. Add the METHOD macro as first line in
+all your methods and the FUNCTION macro in your functions, then you'll
+get a nice log4cxx based entry and exit tracing.
+
+New: mrw::ifelse, acts as A ? A : B but with only one access to A
+
+Repaired and tested: mrw::Dir (on my system, type is alway UNKOWN)
+
+DELETED:
+ - mrw::min and mrw::max
+ - SimpleTrace (use log4cxx instead!)
+
 2005-02-18
 
 Added a new class DynamicLibrary which is a wrapper around the system
diff --git a/README b/README
index 140ef68..a19fb13 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Featureful C++ Library containing a lot of needful things. Everything,
-I often need, but it's missing in C++ standard libraries and other
+I often need, but is missing in C++ standard libraries and other
 common 3rd party libraries, such as log4cxx, cppunit and boost.
 
 I have paid attention to define simple and a nice to use
@@ -38,7 +38,9 @@ The library contains modules for the following purposes:
  - Tokenizer
    Split a string into tokens and iterate through them
 
- - Simple Tracing (for temporary debugging)
+ - Function Trace (using log4cxx)
+    - Automatic Function Trace: Add function trace with no code
+      change!
 
  - A C++ wrapper around libltdl, Libtool Dynamic Loading library