diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshAction.java b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshAction.java
index cafc437..4e2c148 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshAction.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshAction.java
@@ -47,16 +47,16 @@
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Option(name="-l", aliases={"--username"})
+    @Option(name="-l", aliases={"--username"}, description = "Username")
     private String username;
 
-    @Option(name="-P", aliases={"--password"})
+    @Option(name="-P", aliases={"--password"}, description = "Password")
     private String password;
 
-    @Argument(required=true)
+    @Argument(required=true, description = "Host")
     private String hostname;
 
-    @Option(name="-p", aliases={"--port"})
+    @Option(name="-p", aliases={"--port"}, description = "Port")
     private int port = 22;
 
     private BeanContainer container;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshServerAction.java b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshServerAction.java
index db1cfb0..1166858 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshServerAction.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/ssh/SshServerAction.java
@@ -40,10 +40,10 @@
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Option(name="-p", aliases={ "--port" })
+    @Option(name="-p", aliases={ "--port" }, description = "Port")
     private int port=8101;
 
-    @Option(name="-b", aliases={ "--background"})
+    @Option(name="-b", aliases={ "--background"}, description = "Background")
     private boolean background = true;
 
     private BeanContainer container;