2 files changed, 7 insertions, 5 deletions
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 01be723..3e22f5a 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -28,7 +28,7 @@
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd December 24, 2008
+.Dd December 14, 2012
 .Dt SAVECORE 8
 .Os
 .Sh NAME
@@ -37,10 +37,12 @@
 .Sh SYNOPSIS
 .Nm
 .Fl c
+.Op Fl v
+.Op Ar device ...
 .Nm
 .Fl C
 .Op Fl v
-.Op Ar directory device
+.Op Ar device ...
 .Nm
 .Op Fl fkvz
 .Op Ar directory Op Ar device ...
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index c11c15e..a1fe848 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -636,8 +636,8 @@ static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: savecore -c",
-	    "       savecore -C [-v] [directory device]",
+	    "usage: savecore -c [-v] [device ...]",
+	    "       savecore -C [-v] [device ...]",
 	    "       savecore [-fkvz] [directory [device ...]]");
 	exit (1);
 }
@@ -685,7 +685,7 @@ main(int argc, char **argv)
 		usage();
 	argc -= optind;
 	argv += optind;
-	if (argc >= 1) {
+	if (argc >= 1 && !checkfor && !clear) {
 		error = chdir(argv[0]);
 		if (error) {
 			syslog(LOG_ERR, "chdir(%s): %m", argv[0]);