diff --git a/html/user/gpu_list.php b/html/user/gpu_list.php
index 08b7a376f9..e59461f9bd 100644
--- a/html/user/gpu_list.php
+++ b/html/user/gpu_list.php
@@ -45,7 +45,7 @@ function get_gpu_model($x, $vendor) {
 function add_model($model, $r, $wu, &$models) {
     if (array_key_exists($model, $models)) {
         $models[$model]->count++;
-        $models[$model]->time += $r->elapsed_time;
+        $models[$model]->time += $r->elapsed_time/$wu->rsc_fpops_est;
     } else {
         $x = new StdClass;
         $x->count = 1;
@@ -76,7 +76,15 @@ function get_gpu_list($vendor, $alt_vendor=null) {
     foreach($avs as $av) {
         $av_ids .= "$av->id, ";
     }
-    $av_ids .= "0";
+    if ($vendor == "cuda") {
+        $av_ids .= "-3";
+    } else if ($vendor == "ati") {
+        $av_ids .= "-4";
+    } else if ($vendor == "intel_gpu") {
+        $av_ids .= "-5";
+    } else {
+        $av_ids .= "0";
+    }
 
     $t = time() - 30*86400;
     //echo "start enum $vendor $av_ids\n";
@@ -196,7 +204,7 @@ if ($d) {
 }
 
 page_head(tra("Top GPU models"));
-echo tra("The following lists show the most productive GPU models on different platforms.  Relative speeds are shown in parentheses.");
+echo tra("The following lists show the most productive GPU models on different platforms.  Relative speeds, measured by average elapsed time of tasks, are shown in parentheses.");
 show_vendor("NVIDIA", $data->cuda);
 show_vendor("ATI/AMD", $data->ati);
 show_vendor("Intel", $data->intel_gpu);