diff --git a/fdroidserver/index.py b/fdroidserver/index.py
index 72a11a5d..69237149 100644
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@@ -195,10 +195,10 @@ def make_website(apps, repodir, repodict):
         <kbd>
           {number_of_apps}
         </kbd>
-        apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:
+        apps. To add it to your F-Droid app, scan the QR code (click it to enlarge) or use this link:
       </p>
       <p class="center" style="margin-top:.5em">
-        <a href="{link_fingerprinted}">
+        <a href="https://fdroid.link/#{link_fingerprinted}">
           <code style="color:#000000;font-weight:bold;">
             {link}
           </code>
diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index 2d0b2325..400ad0ba 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -306,7 +306,10 @@ def main():
         readme = '''
 # {repo_git_base}
 
-[![{repo_url}]({repo_url}/icons/icon.png)]({repo_url})
+This is an app repository for nightly versions.
+You can use it with the [F-Droid](https://f-droid.org/) Android app.
+
+[![{repo_url}]({repo_url}/icons/icon.png)](https://fdroid.link/#{repo_url})
 
 Last updated: {date}'''.format(repo_git_base=repo_git_base,
                                repo_url=repo_url,