diff --git a/ChangeLog b/ChangeLog
index 031c065aa..ad2afe995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
   thanks to JT Justman - jtjustman
 - bug #2491017 [operations] ANSI mode not supported (db rename and table move) 
+- bug #2609346 [operations] Fix copying views.
 
 3.1.3.0 (2009-02-28)
 + [lang] Turkish update, thanks to Burak Yavuz
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 08f9a1c47..443030b08 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -444,6 +444,7 @@ function PMA_getTableDefStandIn($db, $view, $crlf) {
  * @param   string   the url to go back in case of error
  * @param   boolean  whether to include creation/update/check dates
  * @param   boolean  whether to add semicolon and end-of-line at the end
+ * @param   boolean  whether we're handling view
  *
  * @return  string   resulting schema
  *
@@ -453,7 +454,7 @@ function PMA_getTableDefStandIn($db, $view, $crlf) {
  *
  * @access  public
  */
-function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true)
+function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
 {
     global $sql_drop_table;
     global $sql_backquotes;
@@ -519,12 +520,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
     // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
     // produce a displayable result for the default value of a BIT
     // field, nor does the mysqldump command. See MySQL bug 35796
-    /*
-     * We have to select database and not use database name in SHOW CREATE,
-     * otherwise CREATE statement can include database name.
-     */
-    PMA_DBI_select_db($db);
-    $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($table));
+    $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table));
     // an error can happen, for example the table is crashed
     $tmp_error = PMA_DBI_getError();
     if ($tmp_error) {
@@ -544,6 +540,17 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
             $create_query = str_replace("\r", $crlf, $create_query);
         }
 
+        /*
+         * Drop database name from VIEW creation.
+         *
+         * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
+         * database name, but we don't want name to show up in CREATE VIEW
+         * statement.
+         */
+        if ($view) {
+            $create_query = preg_replace('/' . PMA_backquote($db) . '\./', '', $create_query);
+        }
+
         // Should we use IF NOT EXISTS?
         if (isset($GLOBALS['sql_if_not_exists'])) {
             $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
@@ -762,7 +769,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
             if ($export_type != 'table') {
                 $dump .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table) . ';' . $crlf;
             }
-            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
+            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
             break;
         case 'stand_in':
             $dump .=  PMA_exportComment($GLOBALS['strStandInStructureForView'] . ' ' . $formatted_table_name)