diff --git a/main.go b/main.go
index ac19934..803f3ae 100644
--- a/main.go
+++ b/main.go
@@ -81,7 +81,7 @@ func main() {
 			Usage:  "connection timeout",
 			EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT",
 		},
-		cli.IntFlag{
+		cli.DurationFlag{
 			Name:   "command.timeout,T",
 			Usage:  "command timeout",
 			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT",
@@ -200,7 +200,7 @@ func run(c *cli.Context) error {
 			Host:           c.StringSlice("host"),
 			Port:           c.Int("port"),
 			Timeout:        c.Duration("timeout"),
-			CommandTimeout: c.Int("command.timeout"),
+			CommandTimeout: c.Duration("command.timeout"),
 			Script:         c.StringSlice("script"),
 			ScriptStop:     c.Bool("script.stop"),
 			Secrets:        c.StringSlice("secrets"),
diff --git a/plugin.go b/plugin.go
index e194772..f2a8bea 100644
--- a/plugin.go
+++ b/plugin.go
@@ -29,7 +29,7 @@ type (
 		Host           []string
 		Port           int
 		Timeout        time.Duration
-		CommandTimeout int
+		CommandTimeout time.Duration
 		Script         []string
 		ScriptStop     bool
 		Secrets        []string