diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index a49b53a0..53d11109 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -332,8 +332,9 @@ if (isset($_GET["pgsql"])) {
 			if (min_version(9, 0, $connection)) {
 				$connection->query("SET application_name = 'Adminer'");
 			}
-			$connection->server_info = $connection->result("SELECT version()");
-			$connection->cockroach = preg_match('~CockroachDB~', $connection->server_info);
+			$version = $connection->result("SELECT version()");
+			$connection->cockroach = preg_match('~CockroachDB~', $version);
+			$connection->server_info = preg_replace('~^\D*([\d.]+[-\w]*).*~', '\1', $version);
 			if ($connection->cockroach) { // we don't use "PostgreSQL / CockroachDB" by default because it's too long
 				$drivers[DRIVER] = "CockroachDB";
 			}
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 94b72231..03ca625b 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -128,7 +128,7 @@ function min_version($version, $maria_db = "", $connection2 = null) {
 		$server_info = $match[1];
 		$version = $maria_db;
 	}
-	return $version && version_compare(preg_replace('~^\D+~', '', $server_info), $version) >= 0;
+	return $version && version_compare($server_info, $version) >= 0;
 }
 
 /** Get connection charset