diff --git a/cmd/gomobile/doc.go b/cmd/gomobile/doc.go
index 1340c70..0abf357 100644
--- a/cmd/gomobile/doc.go
+++ b/cmd/gomobile/doc.go
@@ -28,11 +28,10 @@ Commands:
 	build       compile android APK and iOS app
 	init        install android compiler toolchain
 	install     compile android APK and install on device
+	version     print version
 
 Use 'gomobile help [command]' for more information about that command.
 
-NOTE: iOS support is not ready yet.
-
 
 Build a shared library for android APK and iOS app
 
@@ -65,8 +64,8 @@ installed. Support is not complete.
 
 The -v flag provides verbose output, including the list of packages built.
 
-The build flags -a, -i, -n, -x, and -tags are shared with the build command.
-For documentation, see 'go help build'.
+The build flags -a, -i, -n, -x, -gcflags, -ldflags, -tags, and -work
+are shared with the build command. For documentation, see 'go help build'.
 
 
 Compile android APK and iOS app
@@ -97,8 +96,8 @@ output file name depends on the package built.
 
 The -v flag provides verbose output, including the list of packages built.
 
-The build flags -a, -i, -n, -x, and -tags are shared with the build command.
-For documentation, see 'go help build'.
+The build flags -a, -i, -n, -x, -gcflags, -ldflags, -tags, and -work are
+shared with the build command. For documentation, see 'go help build'.
 
 
 Install android compiler toolchain
@@ -128,7 +127,17 @@ attached mobile device.
 
 Only -target android is supported. The 'adb' tool must be on the PATH.
 
-The build flags -a, -i, -n, -x, and -tags are shared with the build command.
+The build flags -a, -i, -n, -x, -gcflags, -ldflags, -tags, and -work are
+shared with the build command.
 For documentation, see 'go help build'.
+
+
+Print version
+
+Usage:
+
+	gomobile version
+
+Version prints versions of the gomobile binary and tools
 */
 package main
diff --git a/cmd/gomobile/main.go b/cmd/gomobile/main.go
index 86f514c..a0d998c 100644
--- a/cmd/gomobile/main.go
+++ b/cmd/gomobile/main.go
@@ -116,7 +116,12 @@ func helpDocumentation(path string) {
 		w.WriteString("\n\n")
 		w.WriteRune(unicode.ToUpper(r))
 		w.WriteString(cmd.Short[rlen:])
-		w.WriteString("\n\nUsage:\n\n\tgomobile " + cmd.Name + " " + cmd.Usage + "\n")
+		w.WriteString("\n\nUsage:\n\n\tgomobile " + cmd.Name)
+		if cmd.Usage != "" {
+			w.WriteRune(' ')
+			w.WriteString(cmd.Usage)
+		}
+		w.WriteRune('\n')
 		w.WriteString(cmd.Long)
 	}
 
@@ -172,6 +177,4 @@ Commands:
 	{{.Name | printf "%-11s"}} {{.Short}}{{end}}
 
 Use 'gomobile help [command]' for more information about that command.
-
-NOTE: iOS support is not ready yet.
 `))