diff --git a/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c
index e1a1208bc..630e53c11 100644
--- a/kpasswd/kpasswd-generator.c
+++ b/kpasswd/kpasswd-generator.c
@@ -180,6 +180,12 @@ main(int argc, char **argv)
     setprogname(argv[0]);
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
+    if (help_flag)
+	usage (0);
+    if (version_flag) {
+	print_version(NULL);
+	return 0;
+    }
     argc -= optind;
     argv += optind;