diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index cc179a95..cb70e049 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -33,6 +33,7 @@
 <li>OBJ writer: Added param 'texture_file' to the Options class, it specifies the path to the texture file (Thanks to Philipp Auersperg-Castell for the patch)</li>
 <li>OBJ writer: added param 'material_file_extension' to the Options class, it specifies the material file suffix, default is ".mat" as it was before. (Thanks to Philipp Auersperg-Castell for the patch)</li>
 <li>PLY reader/writer: Support for meshlab texture coordinates and ids in PLY IO (Thanks to  Gregoire Grzeczkowicz for the patch)</li>
+<li>PLY reader/writer: Fixed possible buffer overflow(Thanks to Ondřej Nečas for the bugreport)</li>
 </ul>
 
 <b>Build System</b>
diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.hh b/src/OpenMesh/Core/IO/reader/PLYReader.hh
index 5828a756..4fdc5803 100644
--- a/src/OpenMesh/Core/IO/reader/PLYReader.hh
+++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh
@@ -145,7 +145,17 @@ private:
 
   /// Read unsupported properties in PLY file
   void consume_input(std::istream& _in, int _count) const {
-	  _in.read(reinterpret_cast<char*>(&buff[0]), _count);
+
+      // Make sure, we do not run over our buffer size
+      int loops = _count / 8 ;
+
+      // Read only our buffer size batches
+      for ( auto i = 0 ; i < loops; ++i) {
+          _in.read(reinterpret_cast<char*>(&buff[0]), 8);
+      }
+
+      // Read reminder which is smaller than our buffer size
+      _in.read(reinterpret_cast<char*>(&buff[0]), _count - 8 * loops );
   }
 
   mutable unsigned char buff[8];