diff --git a/feeds.py b/feeds.py
index c33cc17..956fd50 100644
--- a/feeds.py
+++ b/feeds.py
@@ -729,17 +729,17 @@ def make_feed_page(session):
 
     # Footer.
     if is_atom_feed:
-        origin_url = f"{session.server_root()}{context.title() if context else ''}"
+        origin_url = f"{session.server_root()}/{urlparse.quote(context.title()) if context else ''}"
         atom_header = f"""<?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 <title>{session.feed_title()}</title>
 <link href="{origin_url}" />
 <link rel="self" type="application/atom+xml" href="{session.req.url()}" />
-<id>{session.req.url()}/</id>
+<id>{session.req.url()}</id>
 <updated>{atom_timestamp(ts_last_updated if ts_last_updated else time.time())}</updated>
 <generator uri="https://gmi.skyjake.fi/bubble/" version="{session.bubble.version}">Bubble</generator>
 """
-        atom_footer = "</feed>"
+        atom_footer = "\n</feed>"
         return 20, 'application/atom+xml', atom_header + page + atom_footer
 
     elif not is_tinylog: