diff --git a/ablog/__init__.py b/ablog/__init__.py
index d4adf7e..4516581 100755
--- a/ablog/__init__.py
+++ b/ablog/__init__.py
@@ -34,8 +34,13 @@ def builder_support(builder):
 def html_page_context(app, pagename, templatename, context, doctree):
 
     if builder_support(app):
-        context['ablog'] = Blog(app)
+        context['ablog'] = blog = Blog(app)
         context['anchor'] = anchor
+        # following is already available for archive pages
+        if blog.blog_baseurl and 'feed_path' not in context:
+            context['feed_path'] = blog.blog_path
+            context['feed_title'] = blog.blog_title
+
 
 
 def setup(app):
diff --git a/ablog/post.py b/ablog/post.py
index 5d4fe52..756d275 100644
--- a/ablog/post.py
+++ b/ablog/post.py
@@ -510,8 +510,6 @@ def generate_archive_pages(app):
             'header': header,
             'catalog': catalog,
             'summary': True,
-            'atom_feed': atom_feed,
-            'feed_path': blog_path,
         }
         yield (catalog.docname, context, 'catalog.html')
 
@@ -525,10 +523,10 @@ def generate_archive_pages(app):
                 'header': header,
                 'collection': collection,
                 'summary': True,
-                'atom_feed': atom_feed,
                 'feed_path': collection.path if feed_archives else blog_path,
                 'archive_feed': atom_feed and feed_archives
             }
+            context['feed_title'] = context['title']
             yield (collection.docname, context, 'collection.html')
 
 
diff --git a/ablog/templates/page.html b/ablog/templates/page.html
index dd50074..f19096b 100644
--- a/ablog/templates/page.html
+++ b/ablog/templates/page.html
@@ -2,8 +2,8 @@
 {% set fa = ablog.fontawesome %}
 {%- block extrahead %}
   {{ super() }}
-  {% if ablog.blog_baseurl %}
-  <link rel="alternate" type="application/atom+xml"  href="{{ pathto(ablog.blog_path, 1) }}/atom.xml" title="{{ ablog.blog_title }}">
+  {% if feed_path %}
+  <link rel="alternate" type="application/atom+xml"  href="{{ pathto(feed_path, 1) }}/atom.xml" title="{{ feed_title }}">
   {% endif %}
   {% if ablog.fontawesome_link_cdn%}
   <link href="{{ ablog.fontawesome_link_cdn }}" rel="stylesheet">