diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
index fe2fc13ac..ed2a192e7 100644
--- a/Documentation/boilerplate.c
+++ b/Documentation/boilerplate.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	return EXIT_SUCCESS;
diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index 73fd1ff4e..e003b18b5 100644
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 5)
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 5e70a234b..4e1f13b5f 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2587,6 +2587,8 @@ int main(int argc, char *argv[])
 		case 'z':
 			cf->zero_start = 1;
 			break;
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index efa7a70ef..d39401f6f 100644
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 3)
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 66e1bb90d..ad6b62b50 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index df7f0ceb3..a2b4daa36 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -926,7 +926,7 @@ int main(int argc, char **argv)
 			fdisk_set_size_unit(cxt, FDISK_SIZEUNIT_BYTES);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 915c0c93c..9e7bab898 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -684,7 +684,7 @@ int main(int argc, char **argv)
 			blksize = strtou32_or_err(optarg, _("invalid blocksize argument"));
 			break;
 		default:
-			usage(FSCK_EX_USAGE);
+			errtryhelp(FSCK_EX_USAGE);
 		}
 
 	if ((argc - optind) != 1)
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 97e558b76..34fbfdf72 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1323,7 +1323,7 @@ main(int argc, char **argv) {
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(FSCK_EX_USAGE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index e35be6c7c..cd8a16fc8 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	ct = argc - optind;
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index d66da14eb..0bf18509e 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index bf7f00838..3c7d0f599 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -769,7 +769,7 @@ int main(int argc, char **argv)
 			opt_holes = 1;
 			break;
 		default:
-			usage(FSCK_EX_USAGE);
+			errtryhelp(MKFS_EX_USAGE);
 		}
 	}
 
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 0e26966e5..613a06997 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -793,7 +793,7 @@ int main(int argc, char ** argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(MKFS_EX_USAGE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 93a15deac..b367117dd 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -402,7 +402,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index cff160fbe..d74a52a6e 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -876,9 +876,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index b8dbe72fa..77945bc0f 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(EXIT_SUCCESS);
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	/*
diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c
index 9a6235b5d..5c6c0497a 100644
--- a/disk-utils/resizepart.c
+++ b/disk-utils/resizepart.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 4)
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 2d6597434..fb9fa499a 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -2102,7 +2102,7 @@ int main(int argc, char *argv[])
 			sf->notell = 1;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 89be2aed6..046efb495 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -168,8 +168,7 @@ int main(int argc, char *argv[])
 #endif
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/include/c.h b/include/c.h
index bf11d61ac..3f47dbdcb 100644
--- a/include/c.h
+++ b/include/c.h
@@ -212,6 +212,12 @@ errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
 	exit(eval); \
 })
 
+#define errtryh(eval) __extension__ ({ \
+	fprintf(stderr, _("Try '%s -h' for more information.\n"), \
+			program_invocation_short_name); \
+	exit(eval); \
+})
+
 
 static inline __attribute__((const)) int is_power_of_2(unsigned long num)
 {
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 89e6bd7ec..7f00f79a3 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -175,7 +175,7 @@ static void parse_argv(struct chfn_control *ctl, int argc, char **argv)
 		case 'u':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 		ctl->changed = 1;
 		ctl->interactive = 0;
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index e9e51832d..79fc19d2c 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -153,7 +153,7 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
 			pinfo->shell = optarg;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	/* done parsing arguments.  check for a username. */
diff --git a/login-utils/last.c b/login-utils/last.c
index 75eff5b94..7c243f147 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -1002,8 +1002,7 @@ int main(int argc, char **argv)
 			ctl.time_fmt = which_time_format(optarg);
 			break;
 		default:
-			usage(&ctl, stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index a08db6252..f7acac9b9 100644
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1443,7 +1443,7 @@ int main(int argc, char *argv[])
 			break;
 		}
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 56639d1f0..367333ec3 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (!(pw_entry = getpwuid(getuid())))
diff --git a/login-utils/nologin.c b/login-utils/nologin.c
index 0a06ef8b6..cd62c3677 100644
--- a/login-utils/nologin.c
+++ b/login-utils/nologin.c
@@ -59,8 +59,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_FAILURE;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 0928a2b1a..6a50222ef 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -856,7 +856,7 @@ su_main (int argc, char **argv, int mode)
 	  exit(EXIT_SUCCESS);
 
 	default:
-	  usage (EXIT_FAILURE);
+	  errtryhelp(EXIT_FAILURE);
 	}
     }
 
diff --git a/login-utils/utmpdump.c b/login-utils/utmpdump.c
index fd90b5e10..91eb4fb55 100644
--- a/login-utils/utmpdump.c
+++ b/login-utils/utmpdump.c
@@ -365,7 +365,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 8e8620094..436d34d9d 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -765,10 +765,10 @@ int main(int argc, char **argv)
 			/* ignore - backward compatibility */
 			break;
 		case 'h':
-			err = 0;
-			/* fallthrough */
+			usage(0);
+			break;
 		default:
-			usage(err);
+			errtryh(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 0e2f0d4a0..8df397cbd 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -394,9 +394,8 @@ int main(int argc, char **argv)
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 564c74cc3..aff284728 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1477,8 +1477,7 @@ int main(int argc, char *argv[])
 			force_tree = 1;
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 0e1ebfffc..8111a927e 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -1196,9 +1196,8 @@ int main(int argc, char **argv)
 				errx(EXIT_FAILURE, _("invalid structured data parameter: '%s'"), optarg);
 			add_structured_data_param(get_user_structured_data(&ctl), optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 93c388e6a..58cb83b60 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -127,9 +127,8 @@ main(int argc, char *argv[])
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 684de082b..639db313f 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -586,9 +586,8 @@ int main(int argc, char *argv[])
 		case 'u':
 			disable_columns_truncate();
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index ffeb36abe..cc2d7ce6a 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index df678e003..97e4d5674 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -400,7 +400,7 @@ main(int argc, char **argv)
 			flags |= NAMEI_VERTICAL;
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index c8a4f8ca5..f53b236e2 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 4a2daf936..34bb246da 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -37,6 +37,7 @@
 #include "c.h"
 #include "xalloc.h"
 #include "strutils.h"
+#include "nls.h"
 
 #define LOG(level,args) if (loglev >= level) { fprintf args; }
 
@@ -279,8 +280,7 @@ int main(int argc, char *argv[])
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryh(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 49cf9dc51..313a4afe0 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -641,7 +641,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 40b00ffeb..911fead72 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	switch (do_type) {
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 0021e76e6..2845b18f7 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -546,8 +546,7 @@ main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index 73d1ffa9b..b52aec137 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -439,8 +439,6 @@ int main(int argc, char **argv)
 
 	while((c = getopt_long(argc, argv, "+abdD:fiphmoP:T:rRvV", longopts, NULL)) != -1)
 	{
-		int ret = EXIT_FAILURE;
-
 		switch (c) {
 		case 'a':
 			ctl->all_tasks = 1;
@@ -496,10 +494,9 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
-			ret = EXIT_SUCCESS;
-			/* fallthrough */
+			show_usage(EXIT_SUCCESS);
 		default:
-			show_usage(ret);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index 5528afed5..38a6846f9 100644
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -203,7 +203,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	switch (ioclass) {
diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index d6b21e45c..199d62566 100644
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -172,8 +172,7 @@ int main(int argc, char **argv)
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index c83e12f20..2bfa7f856 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -163,8 +163,7 @@ int main(int argc, char **argv)
 			act = ACT_ZEROOUT;
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index 50b834c0a..92019a912 100644
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -333,7 +333,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c
index 14f5aa48d..ad394ac4c 100644
--- a/sys-utils/chmem.c
+++ b/sys-utils/chmem.c
@@ -308,6 +308,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 4a6958485..840945082 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc < 2)
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index a06c6820d..a608cf574 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1380,9 +1380,8 @@ int main(int argc, char *argv[])
 		case OPT_TIME_FORMAT:
 			ctl.time_fmt = which_time_format(optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;
diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 008b4fe4e..7bc68555a 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -268,8 +268,7 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
 			exit(EXIT_SUCCESS);
 			break;
 		default:
-		case '?':
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			break;
 		}
 	}
diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index 1663a8e7e..eb37b3838 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -347,8 +347,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index dcd0f5e40..08e313e69 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -214,12 +214,10 @@ int main(int argc, char *argv[])
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			exit(EX_OK);
+		case 'h':
+			usage(0);
 		default:
-			/* optopt will be set if this was an unrecognized
-			 * option, i.e.  *not* 'h' or '?
-			 */
-			usage(optopt ? EX_USAGE : 0);
-			break;
+			errtryhelp(EX_USAGE);
 		}
 	}
 
diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
index d4d5bd3df..727319a66 100644
--- a/sys-utils/fsfreeze.c
+++ b/sys-utils/fsfreeze.c
@@ -107,8 +107,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index b764b0b33..e92a822f0 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -331,7 +331,7 @@ int main(int argc, char **argv)
 			verbose = 1;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			break;
 		}
 	}
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index d36c9c9b8..10d9e37e9 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1850,9 +1850,9 @@ int main(int argc, char **argv)
 			out_version();
 			return 0;
 		case 'h':			/* --help */
-		case '?':
-		default:
 			usage(NULL);
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index d79071c8d..f18baf00d 100644
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -127,8 +127,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			ask_shm = ask_msg = ask_sem = 0;
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index 06bbd446b..0432b224f 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -403,7 +403,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
@@ -413,7 +413,7 @@ int main(int argc, char **argv)
 	/* print usage if we still have some arguments left over */
 	if (optind < argc) {
 		warnx(_("unknown argument: %s"), argv[optind]);
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 
 	return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 10ce23883..6fab5b810 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -155,7 +155,7 @@ int main (int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 8961739db..5d6dc0ba0 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -356,8 +356,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(EXIT_SUCCESS);
 		default:
-			warnx(_("invalid option"));
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 215ab9c86..ad508109d 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -698,7 +698,7 @@ int main(int argc, char **argv)
 			flags |= LOOPDEV_FL_SIZELIMIT;
                         break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index e3e6ff65c..df561ac7f 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -2051,7 +2051,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c
index e0de829b4..69733d871 100644
--- a/sys-utils/lsmem.c
+++ b/sys-utils/lsmem.c
@@ -491,7 +491,7 @@ int main(int argc, char **argv)
 				lsmem->want_table = 0;
 			break;
 		default:
-			lsmem_usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index 809737cfa..0c4ff449d 100644
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -718,9 +718,8 @@ int main(int argc, char *argv[])
 			ls.fltr_ntypes++;
 			break;
 		}
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 92526cf78..b45de78ed 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -1017,8 +1017,7 @@ int main(int argc, char **argv)
 			mnt_context_set_source(cxt, optarg);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(MOUNT_EX_USAGE);
 		}
 	}
 
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 070d02478..f5302937b 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -173,8 +173,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index fc301d9f3..6dc7b225c 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
 			break;
 #endif
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index a7b28bf09..acc105621 100644
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 3)
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index b244ddb88..b4ad739ed 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -607,9 +607,8 @@ int main(int argc, char **argv)
 		case RAW_OPTION:
 			raw = 1;
 			break;
-
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	if (argc > optind && pid)
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 39a24deda..0170a7240 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index d3d52c2ec..eb9cf21a0 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 				warnx(_("unrecognized option '--list'"));
 			/* fallthrough */
 		default:
-			show_usage(NULL);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 977ccd14a..897be3fd0 100644
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -750,10 +750,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
-		case '?':
-			usage(stderr);
 		default:
-			errx(EXIT_FAILURE, _("unrecognized option '%c'"), c);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index bae97ff9b..ecc32ef41 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc - optind < 1)
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index dd3bf05fc..e20c502bd 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -221,9 +221,8 @@ int main(int argc, char *argv[])
 		case 'U':
 			add_uuid(optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argv += optind;
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 0ee5caf44..0bf95a5cc 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -960,9 +960,8 @@ int main(int argc, char *argv[])
 			return EXIT_SUCCESS;
 		case 0:
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argv += optind;
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 8ea5c0238..7b38255d6 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -238,7 +238,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			print_usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 0c81970c7..950a18c59 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -610,8 +610,7 @@ int main(int argc, char **argv)
 			print_version();
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(MOUNT_EX_USAGE);
 		}
 	}
 
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 234c7501f..edd9bbe69 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
 			propagation = parse_propagation(optarg);
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 761142f2c..49711f0cf 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -553,10 +553,8 @@ int main(int argc, char *argv[])
 			noident = 1;
 			notimeouts = 1;
 			break;
-
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 853401caf..29bdb8518 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -640,7 +640,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/term-utils/mesg.c b/term-utils/mesg.c
index 4181a5874..af9a81ebc 100644
--- a/term-utils/mesg.c
+++ b/term-utils/mesg.c
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/term-utils/script.c b/term-utils/script.c
index e90644aed..a1bf9a608 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -731,7 +731,7 @@ int main(int argc, char **argv)
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index 146133518..5fd3ecb16 100644
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			}
 	argc -= optind;
 	argv += optind;
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
 
 	if ((argc < 1 && !tname) || argc > 3) {
 		warnx(_("wrong number of arguments"));
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 	if (!tname)
 		tname = argv[idx++];
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index f1cdd2407..abcf8b291 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -670,7 +670,7 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
 		case OPT_HELP:
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 }
diff --git a/term-utils/wall.c b/term-utils/wall.c
index 481af7271..fe72e1e1d 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;
diff --git a/term-utils/write.c b/term-utils/write.c
index 2b05e89d9..13d4745f9 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
 		do_write(&ctl);
 		break;
 	default:
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 	free(ctl.dst_tty_path);
 	return EXIT_SUCCESS;
diff --git a/text-utils/col.c b/text-utils/col.c
index 0823573f4..9b0e23058 100644
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
 		case 'H':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (optind != argc)
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index 62f84251a..c6bba4b50 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 431eae0d2..9510b7296 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc > 1)
diff --git a/text-utils/column.c b/text-utils/column.c
index b8d31c989..a642d8432 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
 			xflag = 1;
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 	}
 	argc -= optind;
 	argv += optind;
diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 9d26c4e48..125734dfe 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -137,7 +137,7 @@ parse_args(int argc, char **argv, struct hexdump *hex)
 			exit(EXIT_SUCCESS);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/text-utils/line.c b/text-utils/line.c
index 7bee6d2fd..486e5dd31 100644
--- a/text-utils/line.c
+++ b/text-utils/line.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	setvbuf(stdin, NULL, _IONBF, 0);
diff --git a/text-utils/rev.c b/text-utils/rev.c
index 735aaef3d..fe3884389 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/text-utils/tailf.c b/text-utils/tailf.c
index c111d02c0..9f175822c 100644
--- a/text-utils/tailf.c
+++ b/text-utils/tailf.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc == optind)
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 3fd0b6a85..5421c24a0 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	setupterm(termtype, STDOUT_FILENO, &ret);
 	switch (ret) {