diff --git a/NEWS b/NEWS
index f401fc89..6f55b503 100644
--- a/NEWS
+++ b/NEWS
@@ -124,6 +124,9 @@ Noteworthy changes in version 0.4.1 (unreleased)
    interface, the generic gpgme_get_op_info interface is not useful
    anymore and dropped.
 
+ * The error values GPGME_Invalid_Type and GPGME_Invalid_Mode can not
+   occur anymore and are thus deprecated.
+
  * Interface changes relative to the 0.4.0 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 GpgmeIOCb			CHANGED: Return type from void to GpgmeError.
@@ -193,6 +196,8 @@ gpgme_key_get_as_xml		REMOVED
 GpgmeKeyListResult		NEW
 gpgme_op_keylist_result		NEW
 gpgme_get_op_info		REMOVED
+GPGME_Invalid_Type		DEPRECATED
+GPGME_Invalid_Mode		DEPRECATED
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Noteworthy changes in version 0.4.0 (2002-12-23)
diff --git a/TODO b/TODO
index c2f634c4..94e1f2a7 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,7 @@ Hey Emacs, this is -*- outline -*- mode!
 *** gpgme_trust_item_get_string_attr
 *** gpgme_trust_item_get_ulong_attr
 *** GpgmeAttr
+*** GPGME_Invalid_Type, GPGME_Invalid_Mode
 
 * Thread support:
 ** Build thread modules for static linking (which just suck in the
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 6479ebf2..ee640b5e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-04  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.h (GpgmeError): Add deprecated values for
+	GPGME_Invalid_Type and GPGME_Invalid_Mode.
+
 2003-04-30  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme.h (gpgme_get_op_info): Remove prototype.
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 0fdd45bd..8d1e0fe6 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -116,7 +116,9 @@ typedef enum
 
     /* Deprecated.  */
     GPGME_Busy                    = -2,
-    GPGME_No_Request              = -3
+    GPGME_No_Request              = -3,
+    GPGME_Invalid_Type            = -4,
+    GPGME_Invalid_Mode            = -5
   }
 GpgmeError;