diff --git a/hyptop/hyptop.8 b/hyptop/hyptop.8
index 757db9df..49235bb5 100644
--- a/hyptop/hyptop.8
+++ b/hyptop/hyptop.8
@@ -62,11 +62,11 @@ shown.
 Select sort field for current window. To reverse the sort order, specify the
 option twice. See FIELDS below for definitions.
 .TP
-.BR "\-t <TYPE>,..." " or " "\-\-cpu_types=<TYPE>,..."
+.BR "\-t <TYPE>,..." " or " "\-\-cpu-types=<TYPE>,..."
 Select CPU types that are used for CPU time calculations. See CPU TYPES
 below for definitions.
 .TP
-.BR "\-b" " or " "\-\-batch_mode"
+.BR "\-b" " or " "\-\-batch-mode"
 Use batch mode (no curses). This can be useful for sending output from hyptop
 to another program, a file, or a line mode terminal.
 In this mode no user input is accepted.
@@ -113,13 +113,13 @@ All values are enclosed in double quotation marks and separated by commas. The
 first line of output contains a list of headings. Subsequent lines each
 represent data for one system in one iteration.
 .PP
-This option implies the "\-\-batch_mode" option.
+This option implies the "\-\-batch-mode" option.
 .RE
 .TP
 .BR "\-d <SECONDS>" " or " "\-\-delay=<SECONDS>"
 Specifies the delay between screen updates.
 .TP
-.BR "\-m <FACTOR>" " or " "\-\-smt_factor=<FACTOR>"
+.BR "\-m <FACTOR>" " or " "\-\-smt-factor=<FACTOR>"
 Specifies a workload dependent SMT speedup factor.
 For IBM z15 servers, the default value is 1.3. If the workload benefits
 from SMT, you can specify a higher value. If the workload does not benefit
@@ -239,7 +239,7 @@ The following units are supported:
 
 .SH CPU TYPES
 Depending on the hypervisor different CPU types are supported. These CPU
-types can be selected either interactively or with the "--cpu_types"
+types can be selected either interactively or with the "--cpu-types"
 command line option. The calculation of the CPU data only uses CPUs of
 the specified types.
 
diff --git a/hyptop/opts.c b/hyptop/opts.c
index a8c1f2b6..c08d742c 100644
--- a/hyptop/opts.c
+++ b/hyptop/opts.c
@@ -39,11 +39,11 @@ static char HELP_TEXT[] =
 "-s, --sys SYSTEM[,..]           Systems for current window\n"
 "-f, --fields LETTER[:UNIT][,..] Fields and units for current window\n"
 "-S, --sort LETTER               Sort field for current window\n"
-"-t, --cpu_types TYPE[,..]       CPU types used for time calculations\n"
-"-b, --batch_mode                Use batch mode (no curses)\n"
+"-t, --cpu-types TYPE[,..]       CPU types used for time calculations\n"
+"-b, --batch-mode                Use batch mode (no curses)\n"
 "    --format FORMAT             Output format (" FMT_TYPE_NAMES "), implies -b\n"
 "-d, --delay SECONDS             Delay time between screen updates\n"
-"-m, --smt_factor FACTOR         Machine generation dependent SMT speedup factor.\n"
+"-m, --smt-factor FACTOR         Machine generation dependent SMT speedup factor.\n"
 "-n, --iterations NUMBER         Number of iterations before ending\n";
 
 /*
@@ -51,6 +51,14 @@ static char HELP_TEXT[] =
  */
 #define OPT_FORMAT	256 /* --format */
 
+/*
+ * Options with underscore to keep compatibility
+ */
+#define OPT_BATCH_MODE	257 /* --batch_mode */
+#define OPT_SORT_FIELD	258 /* --sort | --sort_field */
+#define OPT_CPU_TYPES	259 /* --cpu_types */
+#define OPT_SMT_FACTOR	260 /* --smt_factor */
+
 /*
  * Initialize default settings
  */
@@ -339,15 +347,19 @@ void opts_parse(int argc, char *argv[])
 	static struct option long_options[] = {
 		{ "version",     no_argument,       NULL, 'v'},
 		{ "help",        no_argument,       NULL, 'h'},
-		{ "batch_mode",  no_argument,       NULL, 'b'},
+		{ "batch-mode",  no_argument,       NULL, 'b'},
+		{ "batch_mode",  no_argument,       NULL, OPT_BATCH_MODE},
 		{ "delay",       required_argument, NULL, 'd'},
-		{ "smt_factor",  required_argument, NULL, 'm'},
+		{ "smt-factor",  required_argument, NULL, 'm'},
+		{ "smt_factor",  required_argument, NULL, OPT_SMT_FACTOR},
 		{ "window",      required_argument, NULL, 'w'},
 		{ "sys",         required_argument, NULL, 's'},
 		{ "iterations",  required_argument, NULL, 'n'},
 		{ "fields",      required_argument, NULL, 'f'},
-		{ "sort_field",  required_argument, NULL, 'S'},
-		{ "cpu_types",   required_argument, NULL, 't'},
+		{ "sort-field",  required_argument, NULL, 'S'},
+		{ "sort_field",  required_argument, NULL, OPT_SORT_FIELD},
+		{ "cpu-types",   required_argument, NULL, 't'},
+		{ "cpu_types",   required_argument, NULL, OPT_CPU_TYPES},
 		{ "format",      required_argument, NULL, OPT_FORMAT },
 		{ NULL,          0,                 NULL, 0  }
 	};
@@ -366,12 +378,14 @@ void opts_parse(int argc, char *argv[])
 		case 'h':
 			l_usage();
 			hyptop_exit(0);
+		case OPT_BATCH_MODE:
 		case 'b':
 			l_batch_mode_set();
 			break;
 		case 'd':
 			l_delay_set(optarg);
 			break;
+		case OPT_SMT_FACTOR:
 		case 'm':
 			l_factor_set(optarg);
 			break;
@@ -384,12 +398,14 @@ void opts_parse(int argc, char *argv[])
 		case 'n':
 			l_iterations_set(optarg);
 			break;
+		case OPT_CPU_TYPES:
 		case 't':
 			l_cpu_types_set(optarg);
 			break;
 		case 'f':
 			l_fields_set(optarg);
 			break;
+		case OPT_SORT_FIELD:
 		case 'S':
 			l_sort_field_set(optarg);
 			break;