diff --git a/static/templates/catalog_v2_entry.xml b/static/templates/catalog_v2_entry.xml
index b572da69c..c92a692df 100644
--- a/static/templates/catalog_v2_entry.xml
+++ b/static/templates/catalog_v2_entry.xml
@@ -18,7 +18,7 @@
     {{#icons}}<link rel="http://opds-spec.org/image/thumbnail"
           href="{{root}}/catalog/v2/illustration/{{{id}}}/?size={{icon_size}}"
           type="{{icon_mimetype}};width={{icon_size}};height={{icon_size}};scale=1"/>
-    {{/icons}}<link type="text/html" href="{{root}}/{{{content_id}}}" />
+    {{/icons}}<link type="text/html" href="{{root}}/content/{{{content_id}}}" />
     <author>
       <name>{{author_name}}</name>
     </author>
diff --git a/test/library_server.cpp b/test/library_server.cpp
index 5b2cf0fad..d8f1ecacf 100644
--- a/test/library_server.cpp
+++ b/test/library_server.cpp
@@ -83,7 +83,7 @@ std::string maskVariableOPDSFeedData(std::string s)
     "    <tags>unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \
     "    <articleCount>284</articleCount>\n"                            \
     "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link type=\"text/html\" href=\"/ROOT/zimfile%26other\" />\n"               \
+    "    <link type=\"text/html\" href=\"/ROOT/content/zimfile%26other\" />\n"               \
     "    <author>\n"                                                    \
     "      <name>Wikipedia</name>\n"                                    \
     "    </author>\n"                                                   \
@@ -110,7 +110,7 @@ std::string maskVariableOPDSFeedData(std::string s)
     "    <link rel=\"http://opds-spec.org/image/thumbnail\"\n"          \
     "          href=\"/ROOT/catalog/v2/illustration/raycharles/?size=48\"\n" \
     "          type=\"image/png;width=48;height=48;scale=1\"/>\n"               \
-    "    <link type=\"text/html\" href=\"/ROOT/zimfile\" />\n"               \
+    "    <link type=\"text/html\" href=\"/ROOT/content/zimfile\" />\n"               \
     "    <author>\n"                                                    \
     "      <name>Wikipedia</name>\n"                                    \
     "    </author>\n"                                                   \
@@ -134,7 +134,7 @@ std::string maskVariableOPDSFeedData(std::string s)
     "    <tags>public_tag_with_a_value:value_of_a_public_tag;_private_tag_with_a_value:value_of_a_private_tag;wikipedia;_pictures:no;_videos:no;_details:no</tags>\n" \
     "    <articleCount>284</articleCount>\n"                            \
     "    <mediaCount>2</mediaCount>\n"                                  \
-    "    <link type=\"text/html\" href=\"/ROOT/zimfile\" />\n"               \
+    "    <link type=\"text/html\" href=\"/ROOT/content/zimfile\" />\n"               \
     "    <author>\n"                                                    \
     "      <name>Wikipedia</name>\n"                                    \
     "    </author>\n"                                                   \