diff --git a/govc/library/deploy.go b/govc/library/deploy.go
index 16d56e52a..561ba2f73 100644
--- a/govc/library/deploy.go
+++ b/govc/library/deploy.go
@@ -88,10 +88,16 @@ func (cmd *deploy) Description() string {
 
 Examples:
   govc library.deploy /library_name/ovf_template vm_name
-  govc library.deploy /library_name/ovf_template -options deploy.json`
+  govc library.export /library_name/ovf_template/*.ovf # save local copy of .ovf
+  govc import.spec *.ovf > deploy.json # generate options from .ovf
+  # edit deploy.json as needed
+  govc library.deploy -options deploy.json /library_name/ovf_template`
 }
 
 func (cmd *deploy) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() > 2 {
+		return flag.ErrHelp
+	}
 	path := f.Arg(0)
 	name := f.Arg(1)
 
diff --git a/govc/test/library.bats b/govc/test/library.bats
index 1c3970ea4..23a5b3cd9 100755
--- a/govc/test/library.bats
+++ b/govc/test/library.bats
@@ -221,6 +221,9 @@ load test_helper
 }
 EOF
 
+  run govc library.deploy "my-content/$TTYLINUX_NAME" -options "$BATS_TMPDIR/ttylinux.json"
+  assert_failure # see issue #2599
+
   run govc library.deploy -options "$BATS_TMPDIR/ttylinux.json" "my-content/$TTYLINUX_NAME"
   assert_success
   rm "$BATS_TMPDIR/ttylinux.json"