diff --git a/src/server/internalServer_catalog_v2.cpp b/src/server/internalServer_catalog_v2.cpp
index 4f3e732f7..a43d968e9 100644
--- a/src/server/internalServer_catalog_v2.cpp
+++ b/src/server/internalServer_catalog_v2.cpp
@@ -44,9 +44,9 @@ enum OPDSResponseKind
 };
 
 const std::string opdsMimeType[] = {
-  "application/atom+xml;type=entry;profile=opds-catalog",
-  "application/atom+xml;profile=opds-catalog;kind=navigation",
-  "application/atom+xml;profile=opds-catalog;kind=acquisition"
+  "application/atom+xml;type=entry;profile=opds-catalog;charset=utf-8",
+  "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8",
+  "application/atom+xml;profile=opds-catalog;kind=acquisition;charset=utf-8"
 };
 
 } // unnamed namespace
@@ -97,7 +97,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
   auto response = ContentResponse::build(
       *this,
       opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
-      "application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8");
+      opdsMimeType[OPDS_ACQUISITION_FEED]);
   return std::move(response);
 }
 
diff --git a/test/server.cpp b/test/server.cpp
index cc75a7b7e..961ef9a06 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -497,13 +497,13 @@ TEST_F(ServerTest, MimeTypes)
     { "/skin/blank.html",                  "text/html" },
     { "/skin/index.css",                   "text/css" },
     { "/skin/index.js",                    "application/javascript" },
-    { "/catalog/root.xml",                 "application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8" },
+    { "/catalog/root.xml",                 "application/atom+xml;profile=opds-catalog;kind=acquisition;charset=utf-8" },
     { "/catalog/v2/searchdescription.xml", "application/opensearchdescription+xml" },
-    { "/catalog/v2/root.xml",              "application/atom+xml;profile=opds-catalog;kind=navigation" },
-    { "/catalog/v2/languages",             "application/atom+xml;profile=opds-catalog;kind=navigation" },
-    { "/catalog/v2/categories",            "application/atom+xml;profile=opds-catalog;kind=navigation" },
-    { "/catalog/v2/entries",               "application/atom+xml;profile=opds-catalog;kind=acquisition" },
-    { "/catalog/v2/entry/6f1d19d0-633f-087b-fb55-7ac324ff9baf", "application/atom+xml;type=entry;profile=opds-catalog" },
+    { "/catalog/v2/root.xml",              "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8" },
+    { "/catalog/v2/languages",             "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8" },
+    { "/catalog/v2/categories",            "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8" },
+    { "/catalog/v2/entries",               "application/atom+xml;profile=opds-catalog;kind=acquisition;charset=utf-8" },
+    { "/catalog/v2/entry/6f1d19d0-633f-087b-fb55-7ac324ff9baf", "application/atom+xml;type=entry;profile=opds-catalog;charset=utf-8" },
     { "/skin/search-icon.svg",             "image/svg+xml" },
     { "/skin/bittorrent.png",              "image/png" },
     { "/skin/favicon/favicon.ico",         "image/x-icon" },