diff --git a/dev-random2/templates/base.html b/dev-random2/templates/base.html
index 548d6a4..3ee32a5 100644
--- a/dev-random2/templates/base.html
+++ b/dev-random2/templates/base.html
@@ -13,7 +13,7 @@
     <!--[if lte IE 8]><link rel="shortcut icon" type="image/x-icon" href="{{ SITEURL }}/favicon.ico" /><![endif]-->
     <link rel="alternate" type="application/atom+xml"
                            title="{{ SITENAME }} — Flux Atom"
-                           href="{{ SITEURL }}/{{ FEED }}" /> 
+                           href="{{ SITEURL }}/{{ FEED_ATOM }}" /> 
     {% if FEED_RSS %}
     <link rel ="alternate" type="application/rss+xml"
                            title="{{ SITENAME }} — Flux RSS"
diff --git a/dev-random2/templates/includes/sidebar.html b/dev-random2/templates/includes/sidebar.html
index 84d17e7..0d5d5ef 100644
--- a/dev-random2/templates/includes/sidebar.html
+++ b/dev-random2/templates/includes/sidebar.html
@@ -34,9 +34,11 @@
           <nav>
             <h3>Liens</h3>
             <ul>
-              <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Flux Atom</a></li>
+            {% if FEED_ATOM %}
+              <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}">Flux ATOM</a></li>
+            {% endif %}
             {% if FEED_RSS %}
-              <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux RSS</a></li>
+              <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}">Flux RSS</a></li>
             {% endif %}
             {% if SOCIAL %}
               {% for name, url in SOCIAL %}