diff --git a/collect_changelogs.py b/collect_changelogs.py
index d8e7d661..c254928f 100755
--- a/collect_changelogs.py
+++ b/collect_changelogs.py
@@ -154,6 +154,8 @@ if __name__ == '__main__':
         # per version rst file
         template = Template(open("%s/source/releases/default.rst.in" % root_dir, "r").read())
         for major_version in template_data['major_versions']:
-            with open("%s/source/releases/%s.rst" % (root_dir, major_version), 'w') as f_out:
-                template_data['this_version'] = major_version
-                f_out.write(template.render(template_data))
+            if major_version in template_data['versions']:
+                # wait for the main version before writing a changelog
+                with open("%s/source/releases/%s.rst" % (root_dir, major_version), 'w') as f_out:
+                    template_data['this_version'] = major_version
+                    f_out.write(template.render(template_data))
diff --git a/source/releases.rst.in b/source/releases.rst.in
index 35e6cf7d..97a5becb 100644
--- a/source/releases.rst.in
+++ b/source/releases.rst.in
@@ -16,5 +16,7 @@ The list below contains all releases, ordered by version number categorized by m
    :titlesonly:
    :glob:
 {% for major_version in major_versions%}
+{%- if major_version in versions %}
    releases/{{major_version}}
+{%- endif %}
 {%- endfor %}