diff --git a/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java b/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
index 411e3dfe16..da516f37cf 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
@@ -26,6 +26,7 @@ import java.util.Set;
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
+ * @author Andy Taylor (andy.taylor@jboss.org)
  * @version $Rev$, $Date$
  */
 public interface Cookie extends Comparable<Cookie> {
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 e37539366b..8785c5a4dc 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
@@ -29,6 +29,7 @@ import org.jboss.netty.util.CaseIgnoringComparator;
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Andy Taylor (andy.taylor@jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
  */
 public class CookieDecoder {
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 325bc8e212..4be5ea8c61 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
@@ -30,6 +30,7 @@ import org.jboss.netty.util.CaseIgnoringComparator;
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Andy Taylor (andy.taylor@jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
  */
 public class CookieEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
index 7984855bbf..92a9aa69ad 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
@@ -265,7 +265,7 @@ public class DefaultCookie implements Cookie {
             switch (c) {
             case '\r': case '\n': case '\f': case 0x0b: case ';':
                 throw new IllegalArgumentException(
-                        value + " contains one of the following prohibited characters: " +
+                        name + " contains one of the following prohibited characters: " +
                         ";\\r\\n\\f\\v (" + value + ')');
             }
         }
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
index 35e28828fd..c906aac1a4 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
@@ -28,7 +28,10 @@ import java.util.Map;
 import org.junit.Test;
 
 /**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Andy Taylor (andy.taylor@jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
  */
 public class CookieDecoderTest {
     @Test
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
index 262abb7059..7a7975e46c 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
@@ -27,7 +27,10 @@ import org.junit.Test;
 
 
 /**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Andy Taylor (andy.taylor@jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
  */
 public class CookieEncoderTest {
     @Test