diff --git a/TODO b/TODO
index ae09a8d..cde007b 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,16 @@ Before the next release:
  - Add oath_alloc_secure() which allocates memory using mmap() +
    mlock() and oath_free_secure() which wipes and frees it.
 
+ - Move key management (locate keyfile, load various key formats,
+   write back after use) into liboath.
+
+ - Implement support for PSKC (RFC 6030) keyfiles.
+
+ - Implement OATH OCRA (RFC 6287) authentication.
+
+ - Determine and document level of compliance with the OATH HOTP /
+   TOTP / OCRA validation server profiles.
+
  - Rewrite openpam_ttyconv(3).
    - mostly done, needs review.