diff --git a/doc/ChangeLog b/doc/ChangeLog
index 32132f18..83dbeb12 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,9 @@
 	* gpgme.texi (Information About Keys): Document (badly) the new
 	key attributes.
 
+	* gpgme.texi (Manipulating Data Buffers): Mention that backend
+	tries to detect encoding automatically.
+
 2002-07-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme.texi (Run Control): Update this section.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 952ee6fa..d599f8ce 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1068,7 +1068,8 @@ a hint on the type of data.  The following data types are available:
 @table @code
 @item GPGME_DATA_ENCODING_NONE
 This specifies that the encoding is not known.  This is the default
-for a new data object.
+for a new data object.  The backend will try its best to detect the
+encoding automatically.
 
 @item GPGME_DATA_ENCODING_BINARY
 This specifies that the data is encoding in binary form; i.e. there is