diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9032cf8f..00dcb7c8 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -139,12 +139,13 @@ default_config = {
     'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",
     'repo_name': "My First FDroid Repo Demo",
     'repo_icon': "fdroid-icon.png",
-    'repo_description': '''
+    'repo_description': _('''
         This is a repository of apps to be used with FDroid. Applications in this
         repository are either official binaries built by the original application
-        developers, or are binaries built from source by the admin of f-droid.org
-        using the tools on https://gitlab.com/u/fdroid.
-        ''',
+        developers, or are binaries built from source by f-droid.org using the
+        tools on https://gitlab.com/fdroid.
+        '''),
+    'archive_description': _('These are the apps that have been archived from the main repo.'),
     'archive_older': 0,
     'lint_licenses': fdroidserver.lint.APPROVED_LICENSES,
 }
diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index 6f09aa4d..0a3a8012 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -232,9 +232,11 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
         config += "repo_name = '%s'\n" % repo_git_base
         config += "repo_url = '%s'\n" % repo_url
         config += "repo_icon = 'icon.png'\n"
+        config += "repo_description = 'Nightly builds from %s'\n" % git_user_email
         config += "archive_name = '%s'\n" % (repo_git_base + ' archive')
         config += "archive_url = '%s'\n" % (repo_base + '/archive')
         config += "archive_icon = 'icon.png'\n"
+        config += "archive_description = 'Old nightly builds that have been archived.'\n"
         config += "archive_older = %i\n" % options.archive_older
         config += "servergitmirrors = '%s'\n" % servergitmirror
         config += "keystore = '%s'\n" % KEYSTORE_FILE