diff --git a/roles/mailman/files/robots.txt b/roles/mailman/files/robots.txt
new file mode 100644
index 0000000000..e97727942b
--- /dev/null
+++ b/roles/mailman/files/robots.txt
@@ -0,0 +1,4 @@
+User-agent: *
+Disallow: /accounts/
+Disallow: /django-admin/
+Disallow: /archives/*/vote$
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 2f9844a1cf..988809239a 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -353,7 +353,12 @@
 
 - name: install our fedora-specific favicon
   copy: src=favicon.ico
-        dest="{{ mailman_webui_basedir }}/static-fedora/hyperkitty/img/favicon.ico"
+        dest="{{ mailman_webui_basedir }}/static-fedora/favicon.ico"
+  tags: mailman
+
+- name: install our fedora-specific robots.txt
+  copy: src=robots.txt
+        dest="{{ mailman_webui_basedir }}/static-fedora/robots.txt"
   tags: mailman
 
 - name: install our fedora-specific brand template override
diff --git a/roles/mailman/templates/apache.conf.j2 b/roles/mailman/templates/apache.conf.j2
index 43a2c2b86b..8dfdc5a6b7 100644
--- a/roles/mailman/templates/apache.conf.j2
+++ b/roles/mailman/templates/apache.conf.j2
@@ -1,4 +1,5 @@
-Alias /favicon.ico {{ mailman_webui_basedir }}/static/hyperkitty/img/favicon.ico
+Alias /favicon.ico {{ mailman_webui_basedir }}/static/favicon.ico
+Alias /robots.txt  {{ mailman_webui_basedir }}/static/robots.txt
 Alias /static      {{ mailman_webui_basedir }}/static
 
 #ErrorLog /var/log/httpd/webui_error.log