diff --git a/system-status/system_info.pl b/system-status/system_info.pl
index 7d2508180..9b011e6a4 100644
--- a/system-status/system_info.pl
+++ b/system-status/system_info.pl
@@ -49,7 +49,9 @@ if (&show_section('host')) {
 		     });
 
 	# Webmin version
-	my $webmin_version = &get_webmin_version(1);
+	my $webmin_version = &get_webmin_version();
+	my $rel = &get_webmin_version_release();
+	$webmin_version .= "-".$rel if ($rel);
 	push(@table, { 'desc' => $text{'right_webmin'},
 		       'value' => $webmin_version });
 	push(@raw, { 'webmin_version' => $webmin_version });
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 89ffbfcba..a33c25386 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -4126,13 +4126,7 @@ if (!$get_webmin_version) {
 	$get_webmin_version = &read_file_contents("$root_directory/version");
 	$get_webmin_version =~ s/\r|\n//g;
 	}
-# Format dev version nicely
-if ($ui_format_dev && length($get_webmin_version) == 13) {
-	return substr($get_webmin_version, 0, 5) . "." . substr($get_webmin_version, 5, 5 - 1) . "." . substr($get_webmin_version, 5 * 2 - 1);
-	}
-else {
-	return $get_webmin_version;
-	}
+return $get_webmin_version;
 }
 
 =head2 get_webmin_version_release
diff --git a/webmin/index.cgi b/webmin/index.cgi
index 73ef3ea0c..05314792c 100755
--- a/webmin/index.cgi
+++ b/webmin/index.cgi
@@ -6,7 +6,9 @@ use strict;
 use warnings;
 require './webmin-lib.pl';
 our (%in, %text, %gconfig, %config);
-my $ver = &get_webmin_version(1);
+my $ver = &get_webmin_version();
+my $rel = &get_webmin_version_release();
+$ver .= "-".$rel if ($rel);
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
 	undef, undef, undef, &text('index_version', $ver));
 my %access = &get_module_acl();