diff --git a/lib/unix_dog/Controller/Main.pm b/lib/unix_dog/Controller/Main.pm
index 8edd9e7..7639f9d 100644
--- a/lib/unix_dog/Controller/Main.pm
+++ b/lib/unix_dog/Controller/Main.pm
@@ -219,6 +219,8 @@ sub get_entry($fullpath) {
         return undef;
     }
 
+    my $url = Mojo::URL->new("https://unix.dog/announcement/");
+    $url->path(basename($fullpath));
 
     return {
         raw      => $announce_content,
@@ -226,6 +228,7 @@ sub get_entry($fullpath) {
         date     => $filestat->mtime,
         filename => basename($fullpath),
         title    => $announce_title,
+        url      => $url,
     };
 }
 
diff --git a/templates/main/announcements.html.ep b/templates/main/announcements.html.ep
index 47badd5..1b1508b 100644
--- a/templates/main/announcements.html.ep
+++ b/templates/main/announcements.html.ep
@@ -19,7 +19,7 @@
         <h2><%= $entry->{"title"} %></h2>
         <p>
             Posted <%= localtime($entry->{"date"})->strftime() %>.
-            <a href="/announcement/<%= $entry->{"filename"} %>">Download PGP signature.</a>
+            <a href="<% $entry->{url} %>">Download PGP signature.</a>
         <p>
         <pre><%= $entry->{"text"} %></pre>
     </article>
diff --git a/templates/main/announcements.rss.ep b/templates/main/announcements.rss.ep
index 6c5eb74..6f85cdd 100644
--- a/templates/main/announcements.rss.ep
+++ b/templates/main/announcements.rss.ep
@@ -15,10 +15,10 @@
         % foreach my $item (@$items) {
             <item>
                 <title><![CDATA[<%= $item->{'title'} %>]]></title>
-                <link>https://unix.dog/announcement/<%= $item->{'filename'} %></link>
-                <guid isPermaLink="true">https://unix.dog/announcement/<%= $item->{'filename'} %></guid>
+                <link><%= $item->{'url'} %></link>
+                <guid isPermaLink="true"><%= $item->{'url'} %></guid>
                 <description><![CDATA[<%== $item->{'text'} %>]]></description>
-                <author>Alpha</author>
+                <author>alpha@unix.dog</author>
                 <pubDate><%= localtime($item->{'date'})->strftime("%a, %d %b %Y %H:%M:%S %z") %></pubDate>
             </item>
         % }