diff --git a/ChangeLog b/ChangeLog
index d5a4d4dc8..ebf05ade5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2910568 [structure] Table size for ARCHIVE tables is not displayed 
 - patch #2899969 [core] Session lock blocks working from a second window,
   thanks to Greg Roach - fisharebest
+- patch #2915168 [import] Incorrect parsing of DELIMITER keyword,
+  thanks to Greg Roach - fisharebest
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index e41259ec3..d736bbe94 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -118,7 +118,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) {
         $old_i = $i;
         // this is about 7 times faster that looking for each sequence i
         // one by one with strpos()
-        if (preg_match('/(\'|"|#|-- |\/\*|`|(?i)' . $delimiter_keyword . ')/', $buffer, $matches, PREG_OFFSET_CAPTURE, $i)) {
+        if (preg_match('/(\'|"|#|-- |\/\*|`|(?i)(?<![A-Z0-9_])' . $delimiter_keyword . ')/', $buffer, $matches, PREG_OFFSET_CAPTURE, $i)) {
             // in $matches, index 0 contains the match for the complete
             // expression but we don't use it
             $first_position = $matches[1][1];