diff --git a/Changes b/Changes
index ade2098..2ffe1a3 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Change history for HTML-Form
 
 {{$NEXT}}
+    - Fix CRLF normalization with HTTP::Message 7.00
 
 6.11      2023-02-11 11:49:19Z
     - Perl::Tidy-ed the entire codebase (GH#42) (Julien Fiegehenn)
diff --git a/lib/HTML/Form/Input.pm b/lib/HTML/Form/Input.pm
index 9374230..8e1549e 100644
--- a/lib/HTML/Form/Input.pm
+++ b/lib/HTML/Form/Input.pm
@@ -113,6 +113,8 @@ sub form_name_value {
     return if $self->disabled;
     my $value = $self->value;
     return unless defined $value;
+    s/\x0d?\x0a|\x0d/\x0d\x0a/g
+      for $name, $value;
     return ( $name => $value );
 }