diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index 64292fed..40e69f8f 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -7,7 +7,7 @@
 <!-- --------------------------------------------------------------------- -->
 
 
-<tr valign=top><td><b>4.2</b> (?/?/?)</td><td>
+<tr valign=top><td><b>5.0</b> (?/?/?)</td><td>
 
 <b>General</b>
 <ul>
@@ -19,6 +19,14 @@
 <li>Fixed bug where range iterators contained an invalid element when the range was empty</li>
 <li>Reintroduced and polished the StatusSet API (Thanks to Martin Marinov)</li>
 <li>More efficient implementation of opposite_halfedge_handle (Less instructions required)</li>
+<li>PolyMeshes: More robust algorithm for computing surface normals (Fixes bad normals on concave polygons)</li>
+</ul>
+
+<b>VectorT</b>
+<ul>
+<li>Modernized VectorT constructors for C++11 (Less redundancy, make some of the VectorT constructors constexpr)</li>
+<li>C++11: Added _htmlColor literal operator.</li>
+<li>C++11: Added explicit static_cast along with static SFINAE checks to VectorT constructor.</li>
 </ul>
 
 <b>IO</b>
diff --git a/README.md b/README.md
index 430a41b2..71a22241 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# OpenMesh, 4.2
+# OpenMesh, 5.0
 
 
 ## Getting OpenMesh
diff --git a/VERSION b/VERSION
index f2b46890..ff7ac193 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
-VERSION=4.2
-MAJOR=4
-MINOR=2
+VERSION=5.0
+MAJOR=5
+MINOR=0
 PATCH=0
 ID=OPENMESH
 
diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake
index b3d6ad9a..f1fc10be 100644
--- a/cmake/FindOpenMesh.cmake
+++ b/cmake/FindOpenMesh.cmake
@@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND)
     "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
     "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
     "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
+    "C:/Program Files/OpenMesh 5.0"
     "C:/Program Files/OpenMesh 4.2"
     "C:/Program Files/OpenMesh 4.1"
     "C:/Program Files/OpenMesh 4.0"
@@ -74,6 +75,9 @@ IF (NOT OPENMESH_FOUND)
     "C:/Program Files/OpenMesh 2.4.1"
     "C:/Program Files/OpenMesh 2.4"
     "C:/Program Files/OpenMesh 2.0/include"
+    "C:/libs/OpenMesh 5.0"
+    "C:/libs/OpenMesh 4.2"
+    "C:/libs/OpenMesh 4.1"
     "C:/libs/OpenMesh 4.0"
     "C:/libs/OpenMesh 3.4"
     "C:/libs/OpenMesh 3.3"
diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h
index 56e56aed..6329f53f 100644
--- a/src/OpenMesh/Core/System/config.h
+++ b/src/OpenMesh/Core/System/config.h
@@ -64,7 +64,8 @@
 
 // ----------------------------------------------------------------------------
 
-#define OM_VERSION 0x40200
+#define OM_VERSION 0x50000
+//#define OM_VERSION 0x40200
 
 // only defined, if it is a beta version
 //#define OM_VERSION_BETA 4