diff --git a/Cargo.toml b/Cargo.toml
index e59fd4f5..efe32e64 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cssparser"
-version = "0.25.6"
+version = "0.25.7"
 authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 description = "Rust implementation of CSS Syntax Level 3"
diff --git a/src/css-parsing-tests/component_value_list.json b/src/css-parsing-tests/component_value_list.json
index 58ac9c5b..ed26e125 100644
--- a/src/css-parsing-tests/component_value_list.json
+++ b/src/css-parsing-tests/component_value_list.json
@@ -360,6 +360,14 @@
 			], ["ident", "baz"]
 		]
 	]
-]
+],
+
+"4/**/%", [
+	["number", "4", 4, "integer"], "%"
+],
+
+"-/**/%", [ "-", "%"],
+
+"#/**/%", [ "#", "%"]
 
 ]
diff --git a/src/serializer.rs b/src/serializer.rs
index 0ae7ef40..0157f0de 100644
--- a/src/serializer.rs
+++ b/src/serializer.rs
@@ -423,6 +423,9 @@ impl TokenSerializationType {
     /// so that they are not re-parsed as a single token.
     ///
     /// See https://drafts.csswg.org/css-syntax/#serialization
+    ///
+    /// See https://github.com/w3c/csswg-drafts/issues/4088 for the
+    /// `DelimPercent` bits.
     pub fn needs_separator_when_before(self, other: TokenSerializationType) -> bool {
         use self::TokenSerializationTypeVariants::*;
         match self.0 {
@@ -442,17 +445,21 @@ impl TokenSerializationType {
                 other.0,
                 Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension | CDC
             ),
-            DelimHash | DelimMinus | Number => matches!(
+            DelimHash | DelimMinus => matches!(
                 other.0,
                 Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension
             ),
+            Number => matches!(
+                other.0,
+                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | DelimPercent | Dimension
+            ),
             DelimAt => matches!(other.0, Ident | Function | UrlOrBadUrl | DelimMinus),
             DelimDotOrPlus => matches!(other.0, Number | Percentage | Dimension),
             DelimAssorted | DelimAsterisk => matches!(other.0, DelimEquals),
             DelimBar => matches!(other.0, DelimEquals | DelimBar | DashMatch),
             DelimSlash => matches!(other.0, DelimAsterisk | SubstringMatch),
             Nothing | WhiteSpace | Percentage | UrlOrBadUrl | Function | CDC | OpenParen
-            | DashMatch | SubstringMatch | DelimQuestion | DelimEquals | Other => false,
+            | DashMatch | SubstringMatch | DelimQuestion | DelimEquals | DelimPercent | Other => false,
         }
     }
 }
@@ -482,6 +489,7 @@ enum TokenSerializationTypeVariants {
     DelimBar,       // '|'
     DelimSlash,     // '/'
     DelimAsterisk,  // '*'
+    DelimPercent,   // '%'
     Other,          // anything else
 }
 
@@ -502,6 +510,7 @@ impl<'a> Token<'a> {
             Token::Delim('-') => DelimMinus,
             Token::Delim('?') => DelimQuestion,
             Token::Delim('$') | Token::Delim('^') | Token::Delim('~') => DelimAssorted,
+            Token::Delim('%') => DelimPercent,
             Token::Delim('=') => DelimEquals,
             Token::Delim('|') => DelimBar,
             Token::Delim('/') => DelimSlash,