diff --git a/doc/ChangeLog b/doc/ChangeLog
index ea613bb1..2c151f7d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.texi (Key Management): Clarify difference between can_sign
+	and can_certify.
+	(Information About Keys): Likewise for GPGME_ATTR_CAN_SIGN and
+	GPGME_ATTR_CAN_CERTIFY.
+
 2003-07-08  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme.texi (Progress Meter Callback): Change return type of
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index abf4194c..0b40f98e 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2018,10 +2018,10 @@ This is true if the subkey is invalid.
 This is true if the subkey can be used for encryption.
 
 @item unsigned int can_sign : 1
-This is true if the subkey can be used for signing.
+This is true if the subkey can be used to create data signatures.
 
 @item unsigned int can_certify : 1
-This is true if the subkey can be used for certification.
+This is true if the subkey can be used to create key certificates.
 
 @item unsigned int secret : 1
 This is true if the subkey is a secret key.
@@ -2174,12 +2174,12 @@ This is true if the key (ie one of its subkeys) can be used for
 encryption.
 
 @item unsigned int can_sign : 1
-This is true if the key (ie one of its subkeys) can be used for
-signing.
+This is true if the key (ie one of its subkeys) can be used to create
+data signatures.
 
 @item unsigned int can_certify : 1
-This is true if the key (ie one of its subkeys) can be used for
-certification.
+This is true if the key (ie one of its subkeys) can be used to create
+key certificates.
 
 @item unsigned int secret : 1
 This is true if the key is a secret key.
@@ -2542,14 +2542,14 @@ representable as a number, and is @code{1} if the sub key can be used
 for encryption, and @code{0} otherwise.
 
 @item GPGME_ATTR_CAN_SIGN
-This specifies if a sub key can be used for signatures.  It is
-representable as a number, and is @code{1} if the sub key can be used
-for signatures, and @code{0} otherwise.
+This specifies if a sub key can be used to create data signatures.  It
+is representable as a number, and is @code{1} if the sub key can be
+used for signatures, and @code{0} otherwise.
 
 @item GPGME_ATTR_CAN_CERTIFY
-This specifies if a sub key can be used for certifications.  It is
-representable as a number, and is @code{1} if the sub key can be used
-for certifications, and @code{0} otherwise.
+This specifies if a sub key can be used to create key certificates.
+It is representable as a number, and is @code{1} if the sub key can be
+used for certifications, and @code{0} otherwise.
 
 @item GPGME_ATTR_SERIAL
 The X.509 issuer serial attribute of the key.  It is representable as