diff --git a/ChangeLog b/ChangeLog
index 60dc1d109..1cb964e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2007-01-02 Michal Čihař  <michal@cihar.com>
+    * libraries/export/sql.php: DELIMITER should not be commented out (bug
+      #1612870).
+
 2006-12-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/export/sql.php: bug #1619647, export of query results
       should not contain procedure definitions
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index a8f26332f..aba8e73d6 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -294,7 +294,7 @@ function PMA_exportDBFooter($db)
               . $comment_marker . $crlf
               . $comment_marker . $GLOBALS['strProcedures'] . $crlf 
               . $comment_marker . $crlf
-              . $comment_marker . 'DELIMITER ' . $delimiter . $crlf
+              . 'DELIMITER ' . $delimiter . $crlf
               . $comment_marker . $crlf;
 
             foreach($procedure_names as $procedure_name) {
@@ -302,7 +302,7 @@ function PMA_exportDBFooter($db)
             }
 
             $procs_funcs .= $comment_marker . $crlf
-              . $comment_marker . 'DELIMITER ;' . $crlf
+              . 'DELIMITER ;' . $crlf
               . $comment_marker . $crlf;
         }