diff --git a/libraries/config.values.php b/libraries/config.values.php
index 1e223dfa0..3e1a4c63c 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -73,6 +73,7 @@ $cfg_db['Import']['format'] = array(
     'docsql', // DocSQL
     'ldi',    // CSV using LOAD DATA
     'sql');   // SQL
+$cfg_db['Import']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
 $cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility'] = array(
     'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
     // removed; in MySQL 5.0.33, this produces exports that
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 47c191b83..852e94db4 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -223,6 +223,7 @@ $strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues co
 $strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
 $strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
 $strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt');
+$strConfigImport_charset_name = __('Character set of the file');
 $strConfigImport_csv_col_names_name = __('Lines terminated by');
 $strConfigImport_csv_enclosed_name = __('Columns enclosed by');
 $strConfigImport_csv_escaped_name = __('Columns escaped by');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index e5c0af237..f1ee4dbf7 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -75,8 +75,9 @@ $forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Features']['Import_export'] = array(
     'UploadDir',
     'SaveDir',
-    'RecodingEngine',
+    'RecodingEngine' => ':group',
     'IconvExtraParams',
+    ':group:end',
     'ZipDump',
     'GZipDump',
     'BZipDump',
@@ -191,6 +192,7 @@ $forms['Main_frame']['Tabs'] = array(
 	'QueryWindowDefTab');
 $forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
+    'charset',
     'allow_interrupt',
     'skip_queries'));
 $forms['Import']['Sql'] = array('Import' => array(
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index fa5c0ce37..746ef82bd 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -103,6 +103,7 @@ $forms['Main_frame']['Tabs'] = array(
     'DefaultTabTable');
 $forms['Import']['Import_defaults'] = array(
     'Import/format',
+    'Import/charset',    
     'Import/allow_interrupt',
     'Import/skip_queries');
 $forms['Import']['Sql'] = array(
@@ -137,6 +138,7 @@ $forms['Import']['Open_Document'] = array(
 $forms['Export']['Export_defaults'] = array(
     'Export/format',
     'Export/compression',
+    'Export/charset',
     'Export/asfile',
     'Export/remember_file_template',
     'Export/file_template_table',