diff --git a/roles/aurweb/tasks/main.yml b/roles/aurweb/tasks/main.yml
index efdab44aca4b1aeb8e0dce7e0b860a499807c87e..a624bae78fabbaf42deeb2ca9b9f6339d1ff1eca 100644
--- a/roles/aurweb/tasks/main.yml
+++ b/roles/aurweb/tasks/main.yml
@@ -1,14 +1,4 @@
 ---
-- name: run maintenance mode
-  include_role:
-    name: maintenance
-  vars:
-    service_name: "site"
-    service_domain: "{{ aurweb_domain }}"
-    service_alternate_domains: []
-    service_nginx_conf: "{{ aurweb_nginx_conf }}"
-  when: maintenance is defined
-
 - name: install required packages
   pacman: name=git,sudo,python-mysql-connector,python-pygit2,python-srcinfo,python-bleach,python-markdown,pyalpm,make,asciidoc,php-apcu,php-apcu-bc state=present
 
diff --git a/roles/aurweb/templates/config.j2 b/roles/aurweb/templates/config.j2
index 8691f73bb94f5598d36079a7d1f48660946d45a0..c096f5d2ab62e0e1515bbd573e91d97697a83f4b 100644
--- a/roles/aurweb/templates/config.j2
+++ b/roles/aurweb/templates/config.j2
@@ -4,7 +4,12 @@ user = {{ aurweb_db_user }}
 password = {{ vault_aurweb_db_password }}
 
 [options]
+{% if maintenance is defined and maintenance %}
+enable_maintenance = 1
+maintenance-exceptions = {{ maintenance_remote_machine }}
+{% else %}
 enable-maintenance = 0
+{% endif %}
 localedir = {{ aurweb_dir }}/web/locale/
 cache = {{ aurweb_cache }}
 cache_pkginfo_ttl = {{ aurweb_cache_pkginfo_ttl }}