diff --git a/TODO b/TODO
index 021fa832..ff949281 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@
    which can not be differentiated from the case that it is not
    representable.
 ** Agree on gpgme_key_unref or gpgme_key_release and drop the other?
+** keylisting mode can go
+** api to specify where to search, lokal and/or remote.
 
 * Implement posix-sema.c
 
@@ -41,6 +43,9 @@
 ** engine operations can return General Error on unknown protocol
    (it's an internal error, as select_protocol checks already).
 
+* Operations
+** Import, export status handler.
+
 * Error Values
 ** Map ASSUAN error values.
 ** Map GpgSM ERR messages.