diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php
index df61244f34..64c988b529 100644
--- a/calendar/inc/class.calendar_export_csv.inc.php
+++ b/calendar/inc/class.calendar_export_csv.inc.php
@@ -36,7 +36,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 		if($options['selection']['select'] == 'criteria') {
 			$query = array(
 				'start' => $options['selection']['start'],
-				'end'   => $options['selection']['end'],
+				'end'   => strtotime('+1 day',$options['selection']['end'])-1,
 				'categories'	=> $options['categories'] ? $options['categories'] : $options['selection']['categories'],
 				//'enum_recuring' => false, // we want the recurring events enumerated for csv export
 				'daywise'       => false,
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index ef52376911..2b0b88df38 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -291,7 +291,7 @@ class calendar_uilist extends calendar_ui
 			case 'custom':
 				$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
 				$this->first = $search_params['start'] = $params['startdate'];
-				$this->last  = $search_params['end'] = $params['enddate'];
+				$this->last  = $search_params['end'] = strtotime('+1 day', $params['enddate'])-1;
 				$label = $this->bo->long_date($this->first,$this->last);
 				break;
 			case 'fixed':