diff --git a/source/_includes/flattr_payment_link.html b/source/_includes/flattr_payment_link.html
new file mode 100644
index 0000000..4d2902f
--- /dev/null
+++ b/source/_includes/flattr_payment_link.html
@@ -0,0 +1,7 @@
+<link rel="payment" href="https://flattr.com/submit/auto?
+      url={{ site.url | cgi_escape }}{{ post.url | cgi_escape }}
+      &user_id={{ site.flattr_user | cgi_escape }}
+      &title={{ post.title | cgi_escape }}
+      &category=text
+      {% unless post.categories == empty %}&tags={{ post.categories | join: ', ' | cgi_escape }}&{% endunless %}
+      {% if post.description %}&description={{ post.description | cgi_escape }}{% endif %}" type="text/html" />
diff --git a/source/atom.xml b/source/atom.xml
index 9d8eabb..e9e386c 100644
--- a/source/atom.xml
+++ b/source/atom.xml
@@ -8,9 +8,6 @@ layout: nil
   <link href="{{ site.url }}/atom.xml" rel="self"/>
   <link href="{{ site.url }}/"/>
   {% if site.hub_url %}<link href="{{ site.hub_url }}" rel="hub"/>{% endif %}
-  {% if site.flattr_user %}
-  <link rel="payment" href="https://flattr.com/submit/auto?url=https%3A%2F%2Fdevelopers.flattr.net%2F&amp;user_id=Mic92" type="text/html" />
-  {% endif %}
   <updated>{{ site.time | date_to_xmlschema }}</updated>
   <id>{{ site.url }}/</id>
   <author>
@@ -24,6 +21,7 @@ layout: nil
     <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
     <link href="{{ site.url }}{{ post.url }}"/>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
+    {% if site.flattr_user %}{% include flattr_payment_link.html %}{% endif %}
     <id>{{ site.url }}{{ post.id }}</id>
     <content type="html"><![CDATA[
       <img src="//piwik.higgsboson.tk/piwik.php?idsite=1&action_name={{post.title | cgi_escape}}" style="border:0" alt="" />