diff --git a/postfix/delete_queues.cgi b/postfix/delete_queues.cgi
index e7c77ab54..d527272d6 100755
--- a/postfix/delete_queues.cgi
+++ b/postfix/delete_queues.cgi
@@ -31,19 +31,19 @@ else {
 	@files = split(/\0/, $in{'file'});
 	if ($in{'confirm'} || !$config{'delete_confirm'}) {
 		# Deleting messages
-		if ($postfix_version < 1.1) {
+		if (&compare_version_numbers($postfix_version, 1.1) < 0) {
 			@qfiles = &recurse_files($config{'mailq_dir'});
 			}
 		foreach $f (@files) {
 			$f =~ /^[A-Za-z0-9]+$/ || next;
-			if ($postfix_version >= 1.1) {
+			if (&compare_version_numbers($postfix_version, 1.1) >= 0) {
 				&system_logged("$config{'postfix_super_command'} -d ".quotemeta($f)." >/dev/null 2>&1 </dev/null");
 				}
 			else {
 				&unlink_file(grep { $_ =~ /\/$f$/ } @qfiles);
 				}
 			}
-		if ($postfix_version < 1.1) {
+		if (&compare_version_numbers($postfix_version, 1.1) < 0) {
 			&system_logged("$config{'postfix_super_command'} -p >/dev/null 2>&1 </dev/null");
 			}
 		&webmin_log("delqs", undef, scalar(@files));
diff --git a/postfix/general.cgi b/postfix/general.cgi
index 7cd1ec89d..b599110c3 100755
--- a/postfix/general.cgi
+++ b/postfix/general.cgi
@@ -104,7 +104,7 @@ print &ui_table_start($text{'general_title_others'}, "width=100%", 4);
 &option_freefield("process_id_directory", 20);
 &option_freefield("recipient_delimiter", 20);
 
-if ($postfix_version < 2.1) {
+if (&compare_version_numbers($postfix_version, 2.1) < 0) {
 	&option_freefield("program_directory", 45);
 	}
 
diff --git a/postfix/index.cgi b/postfix/index.cgi
index 7bec0c3c8..fa7fe77cf 100755
--- a/postfix/index.cgi
+++ b/postfix/index.cgi
@@ -87,8 +87,8 @@ if ($config{'index_check'} && ($err = &check_postfix())) {
 
 @onames =  ( "general", "address_rewriting", "aliases", "canonical",
 	     "virtual", "transport", "relocated", "header", "body", "bcc",
-	     $postfix_version =~ /^3\./ ||
-	      $postfix_version =~ /^2\.(\d+)/ && $1 > 7 ? ( "dependent" ) : ( ),
+	     &compare_version_numbers($postfix_version, 2.7) > 0 ?
+	     	( "dependent" ) : ( ),
 	     "local_delivery", "resource",
 	     "smtpd", "smtp", "sasl", "client",
 	     "rate", "debug", $postfix_version > 2 ? ( ) : ( "ldap" ),
diff --git a/postfix/map_chooser.cgi b/postfix/map_chooser.cgi
index 7eff2adbf..bccc2b838 100755
--- a/postfix/map_chooser.cgi
+++ b/postfix/map_chooser.cgi
@@ -47,7 +47,7 @@ foreach $tv (@maps) {
 		&ui_textbox("mpassword_$i", $myconf->{'password'}, 30));
 	$mtable .= &ui_table_row($text{'chooser_mdbname'},
 		&ui_textbox("mdbname_$i", $myconf->{'dbname'}, 30));
-	if ($postfix_version >= 2.2) {
+	if (&compare_version_numbers($postfix_version, 2.2) >= 0) {
 		# Can use custom query
 		$mtable .= &ui_table_row($text{'chooser_mquery'},
 			&ui_opt_textbox("mquery_$i", $myconf->{'query'}, 40,
diff --git a/postfix/map_chooser_save.cgi b/postfix/map_chooser_save.cgi
index 5cdbf1142..ebf986338 100755
--- a/postfix/map_chooser_save.cgi
+++ b/postfix/map_chooser_save.cgi
@@ -65,7 +65,7 @@ for($i=0; defined($t = $in{"type_".$i}); $i++) {
 		&save_backend_config($file, "password", $in{"mpassword_$i"});
 
 		# Custom query
-		if ($postfix_version >= 2.2) {
+		if (&compare_version_numbers($postfix_version, 2.2) >= 0) {
 			if ($in{"mquery_${i}_def"}) {
 				&save_backend_config($file, "query", undef);
 				}
diff --git a/postfix/save_sasl.cgi b/postfix/save_sasl.cgi
index 3cad02a28..c766f8866 100755
--- a/postfix/save_sasl.cgi
+++ b/postfix/save_sasl.cgi
@@ -60,7 +60,7 @@ foreach $o (&list_smtpd_restrictions()) {
 &set_current_value("smtpd_relay_restrictions", join(" ", @relay));
 
 # Save SSL options
-if ($postfix_version >= 2.3) {
+if (&compare_version_numbers($postfix_version, 2.3) >= 0) {
 	&set_current_value("smtpd_tls_security_level",
 			   $in{'smtpd_tls_security_level'});
 	}
diff --git a/postfix/smtp.cgi b/postfix/smtp.cgi
index c5d577166..5e37f7d7d 100755
--- a/postfix/smtp.cgi
+++ b/postfix/smtp.cgi
@@ -27,7 +27,7 @@ print &ui_table_start($text{'smtp_title'}, "width=100%", 4);
 &option_radios_freefield("fallback_relay", 60, $default);
 
 &option_yesno("ignore_mx_lookup_error", 'help');
-if ($postfix_version <= 2) {
+if (&compare_version_numbers($postfix_version, 2) <= 0) {
 	&option_yesno("smtp_skip_4xx_greeting", 'help');
 	}
 
diff --git a/postfix/virtual.cgi b/postfix/virtual.cgi
index 9891c73db..6d5216e38 100755
--- a/postfix/virtual.cgi
+++ b/postfix/virtual.cgi
@@ -20,7 +20,7 @@ print &ui_table_start($text{'virtual_title'}, "width=100%", 2);
 
 &option_mapfield($virtual_maps, 60);
 
-if ($postfix_version >= 2) {
+if (&compare_version_numbers($postfix_version, 2) >= 0) {
 	&option_radios_freefield("virtual_alias_domains", 40,
 				 $text{'virtual_same'});
 	}