diff --git a/CHANGELOG b/CHANGELOG
index f8c0e992..d44df52b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,16 +2,17 @@
 
 #============================================================================================
 
-OpenMesh 2.0-RC5 ( Rev  255 ):
+OpenMesh 2.0-RC5 ( Rev  256 ):
 
 * Core
 - Fixed build error in function calc_dihedral_angle_fast
 - Made iterators/circulators stl compliant
 - Provide begin/end functions for circulators
+- mostream crash fixed (Thanks to Adrian Secord for providing the patch)
 
 * Readers/Writers
 - Fixed build error in STL writer
-- Fixed and enhanced PLY reader to better handling of unknown properties (Thanks to Michal Nociar for the patch)
+- Fixed and enhanced PLY reader to improve handling of unknown properties (Thanks to Michal Nociar for the patch)
 
 * Documentation
 - Added mesh navigation tutorial
diff --git a/Doc/history.docu b/Doc/history.docu
index 000bed53..766015c5 100644
--- a/Doc/history.docu
+++ b/Doc/history.docu
@@ -7,19 +7,20 @@
 
 <!-- --------------------------------------------------------------------- -->
 
-<tr valign=top><td><b>2.0-RC5</b> (?/?/?,Rev.255)</td><td>
+<tr valign=top><td><b>2.0-RC5</b> (?/?/?,Rev.256)</td><td>
 
 <b>Core</b>
 <ul>
 <li>Fixed build error in function calc_dihedral_angle_fast</li>
 <li>Made iterators/circulators stl compliant</li>
 <li>Provide begin/end functions for circulators</li>
+<li>mostream crash fixed (Thanks to Adrian Secord for providing the patch)</li>
 </ul>
 
 <b>Readers/Writers</b>
 <ul>
 <li>Fixed build error in STL writer</li>
-<li>Fixed and enhanced PLY reader to better handling of unknown properties (Thanks to Michal Nociar for the patch)</li>
+<li>Fixed and enhanced PLY reader to improve handling of unknown properties (Thanks to Michal Nociar for the patch)</li>
 </ul>
 
 <b>Documentation</b>
diff --git a/src/OpenMesh/Core/System/mostream.hh b/src/OpenMesh/Core/System/mostream.hh
index 21bec89f..cc2ccffb 100644
--- a/src/OpenMesh/Core/System/mostream.hh
+++ b/src/OpenMesh/Core/System/mostream.hh
@@ -180,7 +180,7 @@ protected:
     if (!buffer_.empty())
     {
       if (enabled_) multiplex();
-#if defined(OM_CC_GCC) || OM_CC_VERSION < 30000
+#if defined( OM_CC_GCC ) && OM_CC_VERSION < 30000
       buffer_ = ""; // member clear() not available!
 #else
       buffer_.clear();