diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index ac94333a5..ee5b2af5c 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -45,5 +45,6 @@ $form_display->registerForm('Server', $id);
 $form_display->registerForm('Server_login_options', $id);
 $form_display->registerForm('Server_config', $id);
 $form_display->registerForm('Server_pmadb', $id);
+$form_display->registerForm('Server_tracking', $id);
 process_formset($form_display);
 ?>
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index 534b8ca35..ea0c87edc 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -64,6 +64,13 @@ $forms['Server_pmadb'] = array('Servers' => array(1 => array(
     'history' => 'pma_history',
     'tracking' => 'pma_tracking',
     'designer_coords' => 'pma_designer_coords')));
+$forms['Server_tracking'] = array('Servers' => array(1 => array(
+    'tracking_version_auto_create',
+    'tracking_default_statements',
+    'tracking_add_drop_view',
+    'tracking_add_drop_table',
+    'tracking_add_drop_database',
+)));
 $forms['Import_export'] = array(
     'UploadDir',
     'SaveDir',
diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php
index c734010ca..baa2d2c5f 100644
--- a/setup/lib/messages.inc.php
+++ b/setup/lib/messages.inc.php
@@ -298,6 +298,16 @@ $strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
 $strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
 $strSetupServers_SignonSession_name = __('Signon session name');
 $strSetupServers_SignonURL_name = __('Signon URL');
+$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
+$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
+$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
+$strSetupServers_tracking_default_statements_name = __('Statements to track');
+$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
+$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
+$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
+$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
+$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
+$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
 $strSetupServerSslMsg = __('You should use SSL connections if your web server supports it');
 $strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
 $strSetupServers_socket_name = __('Server socket');