diff --git a/logviewer/logviewer-lib.pl b/logviewer/logviewer-lib.pl
index 1a9c1b90c..23bc2b6a2 100755
--- a/logviewer/logviewer-lib.pl
+++ b/logviewer/logviewer-lib.pl
@@ -33,16 +33,16 @@ sub get_journal_since
 {
 return [
         { "" => $text{'journal_since0'} },
-        { "-f" => $text{'journal_since1'} },
-        { "-b" => $text{'journal_since2'} },
-        { "-S '7 days ago'" => $text{'journal_since3'} },
-        { "-S '24 hours ago'" => $text{'journal_since4'} },
-        { "-S '8 hours ago'" => $text{'journal_since5'} },
-        { "-S '1 hour ago'" => $text{'journal_since6'} },
-        { "-S '30 minutes ago'" => $text{'journal_since7'} },
-        { "-S '10 minutes ago'" => $text{'journal_since8'} },
-        { "-S '3 minutes ago'" => $text{'journal_since9'} },
-        { "-S '1 minute ago'" => $text{'journal_since10'} },
+        { "--follow" => $text{'journal_since1'} },
+        { "--boot" => $text{'journal_since2'} },
+        { "--since '7 days ago'" => $text{'journal_since3'} },
+        { "--since '24 hours ago'" => $text{'journal_since4'} },
+        { "--since '8 hours ago'" => $text{'journal_since5'} },
+        { "--since '1 hour ago'" => $text{'journal_since6'} },
+        { "--since '30 minutes ago'" => $text{'journal_since7'} },
+        { "--since '10 minutes ago'" => $text{'journal_since8'} },
+        { "--since '3 minutes ago'" => $text{'journal_since9'} },
+        { "--since '1 minute ago'" => $text{'journal_since10'} },
     ];
 }
 
@@ -55,30 +55,30 @@ my $lines = $in{'lines'} ? int($in{'lines'}) : int($config{'lines'}) || 1000;
 my $journalctl_cmd = &has_command('journalctl');
 return () if (!$journalctl_cmd);
 my $eflags = "";
-$eflags = " -r" if ($config{'reverse'});
+$eflags = " --reverse" if ($config{'reverse'});
 my $jver = &get_journalctl_version();
 $eflags .= " --no-hostname" if (!$config{'showhost'} && $jver && $jver >= 239);
 $journalctl_cmd = "journalctl$eflags";
 my @rs = (
-	{ 'cmd' => "$journalctl_cmd -n $lines",
+	{ 'cmd' => "$journalctl_cmd --lines $lines",
 	  'desc' => $text{'journal_journalctl'},
 	  'id' => "journal-1", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -x ",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --catalog ",
 	  'desc' => $text{'journal_expla_journalctl'},
 	  'id' => "journal-2", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -p alert..emerg",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --priority alert..emerg",
 	  'desc' => $text{'journal_journalctl_alert_emerg'},
 	  'id' => "journal-3", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -p err..crit",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --priority err..crit",
 	  'desc' => $text{'journal_journalctl_err_crit'},
 	  'id' => "journal-4", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -p notice..warning",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --priority notice..warning",
 	  'desc' => $text{'journal_journalctl_notice_warning'},
 	  'id' => "journal-5", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -p debug..info",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --priority debug..info",
 	  'desc' => $text{'journal_journalctl_debug_info'},
 	  'id' => "journal-6", },
-	{ 'cmd' => "$journalctl_cmd -n $lines -k ",
+	{ 'cmd' => "$journalctl_cmd --lines $lines --dmesg ",
 	  'desc' => $text{'journal_journalctl_dmesg'},
 	  'id' => "journal-7", } );
 
@@ -103,17 +103,17 @@ if ($fselect) {
 	foreach my $u (sort keys %units) {
 		my $uname = $u;
 		$uname =~ s/\\x([0-9A-Fa-f]{2})/pack('H2', $1)/eg;
-		push(@rs, { 'cmd' => "$journalctl_cmd -n ".
-				"$lines -u $u",
-				'desc' => $uname,
-				'id' => "journal-a-$u", });
+		push(@rs, { 'cmd' => "$journalctl_cmd --lines ".
+			    "$lines --unit $u",
+			    'desc' => $uname,
+			    'id' => "journal-a-$u", });
 		}
 	}
 # Otherwise, return only the pointer
 # element for the index page
 else {
 	push(@rs, 
-		{ 'cmd' => "$journalctl_cmd -n $lines -u",
+		{ 'cmd' => "$journalctl_cmd --lines $lines --unit",
 		  'desc' => $text{'journal_journalctl_unit'},
 		  'id' => "journal-u" });
 	}
diff --git a/logviewer/view_log.cgi b/logviewer/view_log.cgi
index a9e68feef..c52455df5 100755
--- a/logviewer/view_log.cgi
+++ b/logviewer/view_log.cgi
@@ -28,7 +28,7 @@ if ($in{'idx'} ne '') {
 		my @systemctl_cmds = &get_systemctl_cmds(1);
 		my ($log);
 		if ($in{'idx'} eq 'journal-u') {
-			($log) = grep { $_->{'cmd'} =~ /-u\s+\w+/ }
+			($log) = grep { $_->{'cmd'} =~ /--unit\s+\w+/ }
 					@systemctl_cmds;
 			$in{'idx'} = $log->{'id'};
 			}
@@ -38,7 +38,7 @@ if ($in{'idx'} ne '') {
 			}
 		# If reverse is set, add it to the command
 		if ($reverse) {
-			$log->{'cmd'} .= " -r";
+			$log->{'cmd'} .= " --reverse";
 			}
 		# If since is set and allowed, add it to the command
 		if ($in{'since'} &&
@@ -118,7 +118,7 @@ my $lines = $in{'lines'} ? int($in{'lines'}) : int($config{'lines'});
 my $jfilter = $in{'filter'} ? $in{'filter'} : "";
 my $filter = $jfilter ? quotemeta($jfilter) : "";
 my $reverse = $config{'reverse'} ? 1 : 0;
-my $follow = $in{'since'} eq '-f' ? 1 : 0;
+my $follow = $in{'since'} eq '--follow' ? 1 : 0;
 my $no_navlinks = $in{'nonavlinks'} == 1 ? 1 : undef;
 my $skip_index = $config{'skip_index'} == 1 ? 1 : undef;
 my $help_link = (!$no_navlinks && $skip_index) ?
@@ -126,9 +126,9 @@ my $help_link = (!$no_navlinks && $skip_index) ?
 my $no_links = $no_navlinks || $skip_index;
 my $cmd_unpacked = $cmd;
 $cmd_unpacked =~ s/\\x([0-9A-Fa-f]{2})/pack('H2', $1)/eg;
-$cmd_unpacked =~ s/\s+\-r// if ($follow);
-$cmd_unpacked =~ s/\s+\-n\s+\d+// if ($follow);
-$cmd_unpacked .= " -g \"@{[&html_escape($jfilter)]}\"" if ($filter);
+$cmd_unpacked =~ s/\s+\-\-reverse// if ($follow);
+$cmd_unpacked =~ s/\s+\-\-lines\s+\d+// if ($follow);
+$cmd_unpacked .= " --grep \"@{[&html_escape($jfilter)]}\"" if ($filter);
 my $view_title = $in{'idx'} =~ /^journal/ ?
 	$text{'view_titlejournal'} : $text{'view_title'};
 &ui_print_header("<tt>".&html_escape($file || $cmd_unpacked)."</tt>",
@@ -173,7 +173,7 @@ if (!$follow) {
 		if (@cats) {
 			my $fcmd;
 			if ($cmd =~ /journalctl/) {
-				$fcmd = "$cmd -g $filter";
+				$fcmd = "$cmd --grep $filter";
 				}
 			else {
 				$fcmd = "$cat | grep -i -a $eflag $dashflag $filter ".
diff --git a/logviewer/view_log_progress.cgi b/logviewer/view_log_progress.cgi
index 8998697b7..e4b503abb 100755
--- a/logviewer/view_log_progress.cgi
+++ b/logviewer/view_log_progress.cgi
@@ -29,15 +29,15 @@ if (!&can_edit_log($log) ||
 $| = 1;
 
 # No lines for real time logs
-$log->{'cmd'} =~ s/\s+\-n\s+\d+//;
+$log->{'cmd'} =~ s/\s+\-\-lines\s+\d+//;
 
 # Show real time logs
-$log->{'cmd'} .= " -f";
+$log->{'cmd'} .= " --follow";
 
 # Add filter to the command if present
 my $filter = $in{'filter'} ? quotemeta($in{'filter'}) : "";
 if ($filter) {
-	$log->{'cmd'} .= " -g $filter";
+	$log->{'cmd'} .= " --grep $filter";
 	}
 
 # Open a pipe to the journalctl command