diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index 71feb930..5508751e 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -6,7 +6,7 @@
 
 <!-- --------------------------------------------------------------------- -->
 
-<tr valign=top><td><b>3.4</b> (?/?/?,Rev.1285)</td><td>
+<tr valign=top><td><b>4.0</b> (?/?/?,Rev.1303)</td><td>
 
 <b>LICENSE</b>
 <ul>
@@ -24,6 +24,7 @@
 <li>Fixed wrong normal calculation in calc_face_normal for Poly Meshes. closes #2427</li>
 <li>Fixed various warnings with vector casts</li>
 <li>General: Get rid of some compiler warnings</li>
+<li>VectorT: fix compile error on vector scalar multiplication when scalar type differs of vector scalar type and the scalar was lhs. closes #2367</li>
 </ul>
 
 <b>IO</b>
@@ -36,6 +37,8 @@
 <li>OBJReader: load vertex color values as float in range of [0..1] instead of integers [0..255]</li>
 <li>PLY Reader: Ascii reader now supports custom attributes</li>
 <li>PLY Writer: add custom property support for ascii version</li>
+<li>PLY Reader: unify int8_t/signed char/char in ply reader and writer. </li>
+<li>STL Writer: Add a space after the solid keyword to make some readers happy. </li>
 </ul>
 
 <b>Utils</b>
@@ -63,9 +66,10 @@
 <ul>
 <li>Example for locking vertices in decimater</li>
 <li>Added extra hint about status flags when collapsing edges</li>
-<li>updated tutorial on reading and writing meshes with python bindings</li>
-<li>updated the tutorial with further information on how to build the python bindings</li>
-<li>added missing requestsfor polyMesh in collapsee docu</li>
+<li>Updated tutorial on reading and writing meshes with python bindings</li>
+<li>Updated the tutorial with further information on how to build the python bindings</li>
+<li>Added missing requestsfor polyMesh in collapsee docu</li>
+<li>Add feature support list for readers/writers</li>
 </ul>
 
 <b>Unittests</b>
@@ -76,6 +80,7 @@
 <li>Added unit test for bool PropertyManager::set_range.</li>
 <li>Added write unittest for binary stl files</li>
 <li>Added c++11 test file</li>
+<li>Use the acg macro to add the unittests to make sure flags are passed through (e.g. to enable c++11)</li>
 </ul>
 
 <b>Build System</b>
diff --git a/README b/README
index c6351931..468bffc5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-OpenMesh, 3.4
+OpenMesh, 4.0
 ~~~~~~~~~~~~~~~
 
 0. Licence
diff --git a/VERSION b/VERSION
index 5993599a..dea81e0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
-VERSION=3.4
-MAJOR=3
-MINOR=4
+VERSION=4.0
+MAJOR=4
+MINOR=0
 PATCH=0
 ID=OPENMESH
 
diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake
index 24fdfe5a..15ea0068 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 4.0"
     "C:/Program Files/OpenMesh 3.4"
     "C:/Program Files/OpenMesh 3.3"
     "C:/Program Files/OpenMesh 3.2"
@@ -71,6 +72,7 @@ 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 4.0"
     "C:/libs/OpenMesh 3.4"
     "C:/libs/OpenMesh 3.3"
     "C:/libs/OpenMesh 3.2"
diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h
index a2563695..659e3b03 100644
--- a/src/OpenMesh/Core/System/config.h
+++ b/src/OpenMesh/Core/System/config.h
@@ -64,7 +64,8 @@
 
 // ----------------------------------------------------------------------------
 
-#define OM_VERSION 0x30400
+#define OM_VERSION 0x40000
+// #define OM_VERSION 0x30400
 
 // only defined, if it is a beta version
 //#define OM_VERSION_BETA 4