diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index bbfd53c..0496a98 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.0.052 (2013-12-12)
+	- Bug #871 "Datamatrix coding" was fixed.
+
 6.0.051 (2013-12-02)
 	- cbbox array values in addTTFfont() were converted to integers.
 
diff --git a/README.TXT b/README.TXT
index ac9f934..d4d0fbc 100644
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.0.051
-Release date: 2013-12-02
+Version: 6.0.052
+Release date: 2013-12-12
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2013:
diff --git a/composer.json b/composer.json
index c73d375..2048d1c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.051",
+	"version": "6.0.052",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents.",
diff --git a/include/barcodes/datamatrix.php b/include/barcodes/datamatrix.php
index 775e5cb..95e4cbb 100644
--- a/include/barcodes/datamatrix.php
+++ b/include/barcodes/datamatrix.php
@@ -3,7 +3,7 @@
 // File name   : datamatrix.php
 // Version     : 1.0.004
 // Begin       : 2010-06-07
-// Last Update : 2013-02-04
+// Last Update : 2013-12-12
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -860,6 +860,10 @@ class Datamatrix {
 							++$field_lenght;
 						}
 						if (($field_lenght == 4) OR ($epos == $data_lenght) OR !$this->isCharMode($chr, ENC_EDF)) {
+							if (($epos == $data_lenght) AND ($field_lenght < 3)) {
+								$enc = ENC_ASCII;
+								break;
+							}
 							if ($field_lenght < 4) {
 								// set unlatch character
 								$temp_cw[] = 0x1f;
diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
index 3abe92d..022f997 100644
--- a/include/tcpdf_static.php
+++ b/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.0.051';
+	private static $tcpdf_version = '6.0.052';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 8908bd9..3b4d612 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.0.051
+// Version     : 6.0.052
 // Begin       : 2002-08-03
-// Last Update : 2013-12-02
+// Last Update : 2013-12-12
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.0.051
+ * @version 6.0.052
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.0.051
+ * @version 6.0.052
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {