1 files changed, 11 insertions, 4 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 0a0131cd..f5b84355 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title>wallabag — {{type}} feed</title>
-    <subtitle type="html">RSS feed for {{ type }} entries</subtitle>
+    {% if type != 'tag' %}
+        <title>wallabag — {{type}} feed</title>
+        <subtitle type="html">Atom feed for {{ type }} entries</subtitle>
+        <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id>
+        <link rel="alternate" type="text/html" href="{{ url(type) }}"/>
+    {% else %}
+        <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id>
+        <link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/>
+        <title>wallabag — {{type}} {{ tag }} feed</title>
+        <subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle>
+    {% endif %}
     {% if entries | length > 0 %}
         <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #}
     {% endif %}
-    <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id>
-    <link rel="alternate" type="text/html" href="{{ url(type) }}"/>
     <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/>
     {% if entries.hasPreviousPage %}
         <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/>