diff --git a/include/http_utility.hpp b/include/http_utility.hpp
index 158228f..cb3ebc2 100644
--- a/include/http_utility.hpp
+++ b/include/http_utility.hpp
@@ -47,8 +47,9 @@
 
     std::vector<ContentType> ct;
 
-    auto parameters = *(lit(';') >> lit("q=") >> uint_ >> -(lit('.') >> uint_));
-    auto typeCharset = char_("a-zA-Z.+-");
+    auto typeCharset = +(char_("a-zA-Z0-9.+-"));
+
+    auto parameters = *(lit(';') >> typeCharset >> lit("=") >> typeCharset);
     auto mimeType = knownMimeType |
                     omit[+typeCharset >> lit('/') >> +typeCharset];
     auto parser = +(mimeType >> omit[parameters >> -char_(',') >> *space]);
diff --git a/test/include/http_utility_test.cpp b/test/include/http_utility_test.cpp
index 2a5e8a7..018a5f4 100644
--- a/test/include/http_utility_test.cpp
+++ b/test/include/http_utility_test.cpp
@@ -81,6 +81,15 @@
                                       cborJson),
               ContentType::CBOR);
 
+    EXPECT_EQ(
+        getPreferredContentType("application/json;charset=UTF-8", htmlJson),
+        ContentType::JSON);
+
+    std::array<ContentType, 1> eventStream{ContentType::EventStream};
+    EXPECT_EQ(
+        getPreferredContentType("text/event-stream;charset=UTF-8", eventStream),
+        ContentType::EventStream);
+
     EXPECT_EQ(getPreferredContentType("application/json", cborJson),
               ContentType::JSON);
     EXPECT_EQ(getPreferredContentType("*/*", cborJson), ContentType::ANY);