diff --git a/i18n_subsites/i18n_subsites.py b/i18n_subsites/i18n_subsites.py
index dc27799d4..2a80abb66 100644
--- a/i18n_subsites/i18n_subsites.py
+++ b/i18n_subsites/i18n_subsites.py
@@ -104,6 +104,8 @@ def prepare_site_db_and_overrides():
             overrides['THEME_STATIC_DIR'] = posixpath.join(
                 relpath, _MAIN_SETTINGS['THEME_STATIC_DIR'])
             overrides['THEME_STATIC_PATHS'] = []
+        if 'FEED_DOMAIN' not in overrides:
+            overrides['FEED_DOMAIN'] = posixpath.join(_MAIN_SETTINGS['FEED_DOMAIN'], lang)
         # to change what is perceived as translations
         overrides['DEFAULT_LANG'] = lang
 
diff --git a/i18n_subsites/test_data/output/an-untranslated-article.html b/i18n_subsites/test_data/output/an-untranslated-article.html
index f2f649499..a42e4440c 100644
--- a/i18n_subsites/test_data/output/an-untranslated-article.html
+++ b/i18n_subsites/test_data/output/an-untranslated-article.html
@@ -4,7 +4,8 @@
           <title>Testing site - An untranslated article</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/cz/an-untranslated-article-en.html b/i18n_subsites/test_data/output/cz/an-untranslated-article-en.html
index 4673ee512..c1cd678df 100644
--- a/i18n_subsites/test_data/output/cz/an-untranslated-article-en.html
+++ b/i18n_subsites/test_data/output/cz/an-untranslated-article-en.html
@@ -4,7 +4,8 @@
           <title>Testovací stránka - An untranslated article</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/cz/feeds_all.atom.xml b/i18n_subsites/test_data/output/cz/feeds/all.atom.xml
similarity index 79%
rename from i18n_subsites/test_data/output/cz/feeds_all.atom.xml
rename to i18n_subsites/test_data/output/cz/feeds/all.atom.xml
index 7415e1fc9..071cce115 100644
--- a/i18n_subsites/test_data/output/cz/feeds_all.atom.xml
+++ b/i18n_subsites/test_data/output/cz/feeds/all.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/cz/feeds/all.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
 </content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
diff --git a/i18n_subsites/test_data/output/cz/feeds/misc.atom.xml b/i18n_subsites/test_data/output/cz/feeds/misc.atom.xml
new file mode 100644
index 000000000..2c83dceb4
--- /dev/null
+++ b/i18n_subsites/test_data/output/cz/feeds/misc.atom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka - misc</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/cz/feeds/misc.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
+Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>An untranslated article</title><link href="http://example.com/test/cz/an-untranslated-article-en.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-07-14:/test/cz/an-untranslated-article-en.html</id><content type="html">&lt;p&gt;An article without a translation.
+Here is a link to an &lt;a class="reference external" href="http://example.com/test/pages/untranslated-page.html"&gt;untranslated page&lt;/a&gt;&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/i18n_subsites/test_data/output/cz/index.html b/i18n_subsites/test_data/output/cz/index.html
index c5fca3220..ee8a08a0e 100644
--- a/i18n_subsites/test_data/output/cz/index.html
+++ b/i18n_subsites/test_data/output/cz/index.html
@@ -4,7 +4,7 @@
         <title>Welcome to our Testovací stránka</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
 </head>
diff --git a/i18n_subsites/test_data/output/cz/pages/404.html b/i18n_subsites/test_data/output/cz/pages/404.html
index 884203bcc..1e7807114 100644
--- a/i18n_subsites/test_data/output/cz/pages/404.html
+++ b/i18n_subsites/test_data/output/cz/pages/404.html
@@ -4,7 +4,7 @@
           <title>Testovací stránka - 404 stránka</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
 
@@ -37,4 +37,4 @@ <h1>404 stránka</h1>
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/i18n_subsites/test_data/output/cz/translated-article.html b/i18n_subsites/test_data/output/cz/translated-article.html
index 5a5e5458c..339dd6b26 100644
--- a/i18n_subsites/test_data/output/cz/translated-article.html
+++ b/i18n_subsites/test_data/output/cz/translated-article.html
@@ -4,7 +4,8 @@
           <title>Testovací stránka - Přeložený článek</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
+        <link href="http://example.com/test/cz/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/de/drafts/an-untranslated-article-en.html b/i18n_subsites/test_data/output/de/drafts/an-untranslated-article-en.html
index f01dc3105..d183a4801 100644
--- a/i18n_subsites/test_data/output/de/drafts/an-untranslated-article-en.html
+++ b/i18n_subsites/test_data/output/de/drafts/an-untranslated-article-en.html
@@ -4,7 +4,8 @@
           <title>Testseite - An untranslated article</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/de/feeds_all.atom.xml b/i18n_subsites/test_data/output/de/feeds/all.atom.xml
similarity index 73%
rename from i18n_subsites/test_data/output/de/feeds_all.atom.xml
rename to i18n_subsites/test_data/output/de/feeds/all.atom.xml
index 8d845fe07..7b4f18294 100644
--- a/i18n_subsites/test_data/output/de/feeds_all.atom.xml
+++ b/i18n_subsites/test_data/output/de/feeds/all.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/de/feeds/all.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
 </content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
diff --git a/i18n_subsites/test_data/output/de/feeds/misc.atom.xml b/i18n_subsites/test_data/output/de/feeds/misc.atom.xml
new file mode 100644
index 000000000..7138c9ef0
--- /dev/null
+++ b/i18n_subsites/test_data/output/de/feeds/misc.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite - misc</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/de/feeds/misc.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-14T00:00:00+00:00</updated><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
+Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/i18n_subsites/test_data/output/de/index.html b/i18n_subsites/test_data/output/de/index.html
index fc43ae1b0..c8dd0d3f5 100644
--- a/i18n_subsites/test_data/output/de/index.html
+++ b/i18n_subsites/test_data/output/de/index.html
@@ -4,7 +4,7 @@
         <title>Willkommen Sie zur unserer Testseite</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
 </head>
diff --git a/i18n_subsites/test_data/output/de/pages/404.html b/i18n_subsites/test_data/output/de/pages/404.html
index 642566079..7266df5b0 100644
--- a/i18n_subsites/test_data/output/de/pages/404.html
+++ b/i18n_subsites/test_data/output/de/pages/404.html
@@ -4,7 +4,7 @@
           <title>Testseite - Eine 404 Seite</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/de/pages/untranslated-page-en.html b/i18n_subsites/test_data/output/de/pages/untranslated-page-en.html
index 2df5ff994..0d4d66688 100644
--- a/i18n_subsites/test_data/output/de/pages/untranslated-page-en.html
+++ b/i18n_subsites/test_data/output/de/pages/untranslated-page-en.html
@@ -4,7 +4,7 @@
           <title>Testseite - Untranslated page</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/de/translated-article.html b/i18n_subsites/test_data/output/de/translated-article.html
index 9393b953d..ee5e25b70 100644
--- a/i18n_subsites/test_data/output/de/translated-article.html
+++ b/i18n_subsites/test_data/output/de/translated-article.html
@@ -4,7 +4,8 @@
           <title>Testseite - Ein übersetzter Artikel</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
+        <link href="http://example.com/test/de/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/feeds_all.atom.xml b/i18n_subsites/test_data/output/feeds/all.atom.xml
similarity index 97%
rename from i18n_subsites/test_data/output/feeds_all.atom.xml
rename to i18n_subsites/test_data/output/feeds/all.atom.xml
index c6c090856..992845e11 100644
--- a/i18n_subsites/test_data/output/feeds_all.atom.xml
+++ b/i18n_subsites/test_data/output/feeds/all.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds/all.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
 </content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
diff --git a/i18n_subsites/test_data/output/feeds/misc.atom.xml b/i18n_subsites/test_data/output/feeds/misc.atom.xml
new file mode 100644
index 000000000..80f064c94
--- /dev/null
+++ b/i18n_subsites/test_data/output/feeds/misc.atom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site - misc</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds/misc.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-13T00:00:00+00:00</updated><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
+Here is a link to &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;some image&lt;/a&gt;.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>An untranslated article</title><link href="http://example.com/test/an-untranslated-article.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-07-14:/test/an-untranslated-article.html</id><content type="html">&lt;p&gt;An article without a translation.
+Here is a link to an &lt;a class="reference external" href="http://example.com/test/pages/untranslated-page.html"&gt;untranslated page&lt;/a&gt;&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/i18n_subsites/test_data/output/index.html b/i18n_subsites/test_data/output/index.html
index c45568707..fb88a6eca 100644
--- a/i18n_subsites/test_data/output/index.html
+++ b/i18n_subsites/test_data/output/index.html
@@ -4,7 +4,7 @@
         <title>Welcome to our Testing site</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
 </head>
diff --git a/i18n_subsites/test_data/output/pages/404.html b/i18n_subsites/test_data/output/pages/404.html
index 4695f3cd6..aa1fccc29 100644
--- a/i18n_subsites/test_data/output/pages/404.html
+++ b/i18n_subsites/test_data/output/pages/404.html
@@ -4,7 +4,7 @@
           <title>Testing site - A 404 page</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/pages/untranslated-page.html b/i18n_subsites/test_data/output/pages/untranslated-page.html
index 3ff02dfc6..fc1537210 100644
--- a/i18n_subsites/test_data/output/pages/untranslated-page.html
+++ b/i18n_subsites/test_data/output/pages/untranslated-page.html
@@ -4,7 +4,7 @@
           <title>Testing site - Untranslated page</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
 
diff --git a/i18n_subsites/test_data/output/translated-article.html b/i18n_subsites/test_data/output/translated-article.html
index 45be1bb8c..548edd7bb 100644
--- a/i18n_subsites/test_data/output/translated-article.html
+++ b/i18n_subsites/test_data/output/translated-article.html
@@ -4,7 +4,8 @@
           <title>Testing site - A translated article</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
-        <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
+        <link href="http://example.com/test/feeds/misc.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Categories Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
 
diff --git a/i18n_subsites/test_data/pelicanconf.py b/i18n_subsites/test_data/pelicanconf.py
index 55018f271..b644ef498 100644
--- a/i18n_subsites/test_data/pelicanconf.py
+++ b/i18n_subsites/test_data/pelicanconf.py
@@ -12,9 +12,8 @@
 DEFAULT_LANG = 'en'
 LOCALE = 'en_US.UTF-8'
 
-# Generate only one feed
-FEED_ALL_ATOM = 'feeds_all.atom.xml'
-CATEGORY_FEED_ATOM = None
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
 TRANSLATION_FEED_ATOM = None
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None