diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index c14911cb10..94dd40a2fc 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -258,6 +258,18 @@ class setup_process
 		}
 		// always enable spellchecker, ckeditor now uses spell-as-you-type via a public webservice
 		$current_config['enabled_spellcheck'] = 'True';
+		
+		// always enable history logging for calendar, addressbook and infolog
+		$current_config['history'] = 'history';	// addressbook: only admin
+		$current_config['calendar_delete_history'] = 'history';	// only admins
+		// infolog does NOT use config_app='phpgwapi', but 'infolog'
+		$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			'config_value' => 'history_admin_delete',	// only admins
+		),array(
+			'config_app' => 'infolog',
+			'config_name' => 'history',
+		),__FILE__,__LINE__);
+		
 
 		// RalfBecker: php.net recommend this for security reasons, it should be our default too
 		$current_config['usecookies'] = 'True';