diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9e9f8070..461c896b 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1,7 +1,7 @@
 <?php
 class Adminer {
 	var $functions = array("char_length", "from_unixtime", "hex", "lower", "round", "sec_to_time", "time_to_sec", "unix_timestamp", "upper");
-	var $grouping = array("avg", "count", "distinct", "group_concat", "max", "min", "sum"); // distinct is short for COUNT(DISTINCT)
+	var $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
 	var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL");
 	
 	/** Name in title and navigation
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 2daaf428..d1127664 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -18,7 +18,7 @@ foreach ($fields as $key => $field) {
 
 function apply_sql_function($function, $column) {
 	return ($function
-		? ($function == "distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)"
+		? ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)"
 		: $column
 	);
 }