diff --git a/command_nmap.conf b/command_nmap.conf
index 6ad584d..6d7c668 100644
--- a/command_nmap.conf
+++ b/command_nmap.conf
@@ -2,7 +2,7 @@ object CheckCommand "nmap" {
 	import "ipv4-or-ipv6"
 
 	command = [ "/home/nagios/check_nmap.sh/check_nmap.sh" ]
-	timeout = 12h
+	timeout = 24h
 
 	arguments = {
 		"--host" = {
@@ -19,6 +19,14 @@ object CheckCommand "nmap" {
 			description = "String with ports in nmap format"
 			repeat_key = true
 		}
+		"--ipv4" = {
+			set_if = "$nmap_ipv4$"
+			description = "Use IPv4 for scanning"
+		}
+		"--ipv6" = {
+			set_if = "$nmap_ipv6$"
+			description = "Use IPv6 for scanning"
+		}
 	}
 
 	vars.nmap_host = "$check_address$"