diff --git a/modules/observer.py b/modules/observer.py
index be956242..2f84f8a5 100644
--- a/modules/observer.py
+++ b/modules/observer.py
@@ -5,7 +5,7 @@
 import lib
 
 
-def generate(host):
+def generate(host, *args):
     info = {}
 
     resolvers = lib.get_servers_for_node('eventdns', host)
@@ -16,6 +16,14 @@ def generate(host):
     info['dns_target'] = 'slashdot.org.'
     info['interface'] = 'eth0'
 
+    if 'noipv6' in args:
+        info['disable6'] = '-disable6 '
+    else:
+        info['disable6'] = ''
+    if 'noipv4' in args:
+        info['disable4'] = '-disable4 '
+    else:
+        info['disable4'] = ''
     return {'observer': info}
 
 # vim: ts=4: sts=4: sw=4: expandtab
diff --git a/modules/observer/manifests/init.pp b/modules/observer/manifests/init.pp
index aabcc754..67bc6774 100644
--- a/modules/observer/manifests/init.pp
+++ b/modules/observer/manifests/init.pp
@@ -12,7 +12,7 @@
 # No parameters;
 #
 
-class observer($nameservers, $icmp_target, $dns_target, $interface) {
+class observer($nameservers, $icmp_target, $dns_target, $interface, $disable6, $disable4) {
 
   # Create directories for observer
   file { '/opt/observer':
diff --git a/modules/observer/templates/observer.default.erb b/modules/observer/templates/observer.default.erb
index be4862e2..39645626 100644
--- a/modules/observer/templates/observer.default.erb
+++ b/modules/observer/templates/observer.default.erb
@@ -1,4 +1,4 @@
 # AUTOGENERATED BY PUPPET
 # All manual changes will be overwritten
 
-ARGS="-dns <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>"
+ARGS="<%= @disable4 %><%= @disable6 %>-dns <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>"
\ No newline at end of file