diff --git a/CHANGES b/CHANGES
index 6fe2af5a9a151f3c100ee968ee5327e6fc9b6544..73bf192d231063fd8ed7d30045d9d2bed5e5d88e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel (22 June 2004)
+- Gisle Vanem fixed the certificate wildcard checks to support a '*'-letter
+  anywhere in the wildcard string, support multiple '*'-letters in the
+  wildcard and to allow the '*'-letter to match a string that includes a dot.
+
 Daniel (21 June 2004)
 - testcurl.sh is now removed completely, tests/testcurl.pl is the script to
   use when autobuilding curl!
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 9a78fa074aa0354a02abf79ca3a22e1b141f1d95..cdbea5480fb0e1534d34f66d38dfbf2d9aff1b77 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -4,10 +4,6 @@ Issues not sorted in any particular order.
 To get fixed in 7.12.1 (planned release: August 2004)
 ======================
 
-34 - Fix certificate wildcard checks:
-     http://curl.haxx.se/mail/lib-2004-06/0219.html
-     Gisle works on this.
-
 35 - Fix multi interface when connecting to host with multiple IP addresses:
      http://curl.haxx.se/mail/lib-2004-06/0163.html and
      http://curl.haxx.se/mail/lib-2004-06/0167.html