diff --git a/ChangeLog b/ChangeLog
index de450a712..63eee7682 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-06-27 Michal Čihař  <michal@cihar.com>
+    * libraries/import/csv.php: Fix special case of Excel export with ; at the
+      end (bug #1511046).
+
 2006-06-25 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/export/pdf.php, libraries/plugin_interface.lib.php, lang/*:
       bug #1504218: display an explanation for what is a PDF export
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index 741eeceb4..243dc1b4f 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -236,10 +236,15 @@ if ($plugin_param == 'table') {
                     }
                     // Do we have correct count of values?
                     if (count($values) != $required_fields) {
-                        $message = sprintf($strInvalidCSVFieldCount, $line);
-                        $show_error_header = TRUE;
-                        $error = TRUE;
-                        break;
+                        // Hack for excel
+                        if ($values[count($values) - 1] == ';') {
+                            unset($values[count($values) - 1]);
+                        } else {
+                            $message = sprintf($strInvalidCSVFieldCount, $line);
+                            $show_error_header = TRUE;
+                            $error = TRUE;
+                            break;
+                        }
                     }
                     
                     $first = TRUE;