diff --git a/ChangeLog b/ChangeLog
index 564162b4f..84e438388 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
       to hide creating of database from main (RFE #1370100).
     * Documentation.html, main.php, libraries/left_header.inc.php:
       Customizable link under left logo (RFE #1111599).
+    * libraries/export/htmlword.php: Fix including column names.
 
 2006-04-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * db_printview.php: fixed bug 'no tables found', refactored
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 01422ecae..5c3dceb0c 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -134,7 +134,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     $fields_cnt  = PMA_DBI_num_fields($result);
 
     // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_shownames']) && $GLOBALS[$what . '_shownames'] == 'yes') {
+    if (isset($GLOBALS['htmlword_columns'])) {
         $schema_insert = '<tr class="print-category">';
         for ($i = 0; $i < $fields_cnt; $i++) {
             $schema_insert .= '<td class="print"><b>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</b></td>';