diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index a62ab6fe..5889635f 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -326,6 +326,8 @@ if (isset($_GET["pgsql"])) {
 			if (min_version(9, 0, $connection)) {
 				$connection->query("SET application_name = 'Adminer'");
 			}
+			$crdb_version = $connection->result("SHOW crdb_version");
+			$connection->server_info .= ($crdb_version ? "-" . preg_replace('~ \(.*~', '', $crdb_version) : "");
 			return $connection;
 		}
 		return $connection->error;
diff --git a/changes.txt b/changes.txt
index 7d763c6b..0f54dd5f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ MySQL: Display default values of binary columns
 MySQL: Allow setting default values of json column
 MariaDB: Don't display NULL as default value (regression from 5.0.0)
 PostgreSQL PDO: Escape bytea values (bug #218)
+CockroachDB: Display version
 MS SQL: Fix editing rows with datetime column in primary key
 CSS: Add dark theme
 
diff --git a/tests/cocroachdb.html b/tests/cocroachdb.html
index 3d0f5cca..68f6c1b3 100644
--- a/tests/cocroachdb.html
+++ b/tests/cocroachdb.html
@@ -21,6 +21,7 @@
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[db]</td><td>adminer_test</td></tr>
 <tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>verifyTextPresent</td><td>CockroachDB</td><td></td></tr>
 </tbody></table>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>