diff --git a/ChangeLog b/ChangeLog
index 92c5afad9..0ab622183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.1.2.0 (not yet released)
 - bug #1253252 [display] Can't NULL a column with relation defined 
 - bug #2009500 [SQL] Small improvements in generated SQL (partial fix)
+- bug #1963184 [export] YAML export improvement,
+ thanks to Bryce Thornton - brycethornton
 
 3.1.1.0 (2008-12-09)
 - patch #2242765 [core] Navi panel server links wrong,
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index f17cb5244..cea6a3837 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -138,8 +138,18 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     unset($i);
 
     $buffer = '';
+    $record_cnt = 0;
     while ($record = PMA_DBI_fetch_row($result)) {
-        $buffer = '-' . $crlf;
+        $record_cnt++;
+
+        // Output table name as comment if this is the first record of the table
+        if ($record_cnt == 1) {
+            $buffer = '# ' . $db . '.' . $table . $crlf;
+            $buffer .= '-' . $crlf;
+        } else {
+            $buffer = '-' . $crlf;
+        }
+
         for ($i = 0; $i < $columns_cnt; $i++) {
             if (! isset($record[$i])) {
                 continue;