diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
index 7ab9ac8455..cfda4bd604 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
@@ -33,11 +33,14 @@ import org.jboss.netty.util.CaseIgnoringComparator;
  */
 public class CookieDecoder {
 
-    // TODO: Add domain, path, maxAge, and version (and perhaps secure and comment?)
     private final static String semicolon = ";";
     private final static String equals = "=";
 
     public Map<String, Cookie> decode(String header) {
+        // FIXME: Support both version 0 and 1 cookies
+        // FIXME: Decode all cookie fields, including domain, path, maxAge, secure, and comment.
+        // FIXME: CookieDecoder cannot assume that the first field is always the name-value pair.
+        // FIXME: Check RFC 2109 - http://www.ietf.org/rfc/rfc2109.txt
         Map<String, Cookie> cookies = new TreeMap<String, Cookie>(CaseIgnoringComparator.INSTANCE);
         String[] split = header.split(semicolon);
         for (String s : split) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
index 0971c4e92d..b8d6e242d1 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
@@ -34,7 +34,6 @@ import org.jboss.netty.util.CaseIgnoringComparator;
  */
 public class CookieEncoder {
 
-    // TODO: Add domain, path, maxAge, and version (and perhaps secure and comment?)
     private final Map<String, Cookie> cookies = new TreeMap<String, Cookie>(CaseIgnoringComparator.INSTANCE);
 
     public void addCookie(String name, String val) {
@@ -46,6 +45,9 @@ public class CookieEncoder {
     }
 
     public String encode() {
+        // FIXME: Support both version 0 and 1 cookies
+        // FIXME: Encode all cookie fields, including domain, path, maxAge, secure, and comment.
+        // FIXME: Check RFC 2109 - http://www.ietf.org/rfc/rfc2109.txt
         StringBuffer sb = new StringBuffer();
         Collection<String> cookieNames = cookies.keySet();
         if(cookieNames.isEmpty()) {