diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 9621e0b7..61b69fee 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-22  Werner Koch  <wk@gnupg.org>
+
+	* gpgme.h (_GPGME_D_CLASS): Kludge for C++ compatibility without
+	changing the C API.
+
 2003-11-19  Werner Koch  <wk@gnupg.org>
 
 	* conversion.c (_gpgme_parse_timestamp): New.
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 1e174881..ac5cea74 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -44,7 +44,11 @@ extern "C" {
 #if 0 /* just to make Emacs auto-indent happy */
 }
 #endif
-#endif
+/* Keyword renaming for the sake of C doubleplus. */
+#define _GPGME_D_CLASS clazz
+#else
+#define _GPGME_D_CLASS class
+#endif /* __cplusplus */
 
 #include <gpg-error.h>
 
@@ -507,7 +511,7 @@ struct _gpgme_key_sig
   gpgme_error_t status;
 
   /* Crypto backend specific signature class.  */
-  unsigned int class;
+  unsigned int _GPGME_D_CLASS;
 
   /* The user ID string.  */
   char *uid;
@@ -1087,7 +1091,7 @@ struct _gpgme_new_signature
   char *fpr;
 
   /* Crypto backend specific signature class.  */
-  unsigned int class;
+  unsigned int _GPGME_D_CLASS;
 };
 typedef struct _gpgme_new_signature *gpgme_new_signature_t;