diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 94cdae92fef8..c62950966310 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-16  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/java/net/protocol/http/Headers.java (parse): Include final
+	character of line.
+
 2005-05-16  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/21606:
diff --git a/libjava/gnu/java/net/protocol/http/Headers.java b/libjava/gnu/java/net/protocol/http/Headers.java
index 0db9a552a0f9..9968b2e77802 100644
--- a/libjava/gnu/java/net/protocol/http/Headers.java
+++ b/libjava/gnu/java/net/protocol/http/Headers.java
@@ -323,7 +323,10 @@ public class Headers
         if (c1 == ' ' || c1 == '\t')
           {
             // Continuation
-            value.append(line.substring(0, len - 1));
+	    int last = len - 1;
+	    if (line.charAt(last) != '\r')
+	      ++last;
+            value.append(line.substring(0, last));
           }
         else
           {
@@ -340,7 +343,10 @@ public class Headers
                 di++;
               }
             while (di < len && line.charAt(di) == ' ');
-            value.append(line.substring(di, len - 1));
+	    int last = len - 1;
+	    if (line.charAt(last) != '\r')
+	      ++last;
+            value.append(line.substring(di, last));
           }
       }
   }