diff --git a/minifirewall/defaults/main.yml b/minifirewall/defaults/main.yml
index 2088e089..760b35cc 100644
--- a/minifirewall/defaults/main.yml
+++ b/minifirewall/defaults/main.yml
@@ -15,3 +15,5 @@ minifirewall_semipublic_ports_tcp: [20, 21, 22, 80, 110, 143]
 minifirewall_semipublic_ports_udp: []
 minifirewall_private_ports_tcp: [5666]
 minifirewall_private_ports_udp: []
+
+minifirewall_autostart: "no"
diff --git a/minifirewall/tasks/activate.yml b/minifirewall/tasks/activate.yml
new file mode 100644
index 00000000..f8f6e6bf
--- /dev/null
+++ b/minifirewall/tasks/activate.yml
@@ -0,0 +1,7 @@
+---
+- name: Uncomment minifirewall start line
+  replace:
+    dest: /etc/init.d/alert5
+    regexp: '^#/etc/init.d/minifirewall start'
+    replace: '/etc/init.d/minifirewall start'
+  when: minifirewall_autostart == "yes" 
diff --git a/minifirewall/tasks/main.yml b/minifirewall/tasks/main.yml
index 7eca382e..7727308b 100644
--- a/minifirewall/tasks/main.yml
+++ b/minifirewall/tasks/main.yml
@@ -3,3 +3,5 @@
 - include: install.yml
 
 - include: config.yml
+
+- include: activate.yml