diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php
index b3b2ccb029..80b1d2fdd8 100755
--- a/calendar/inc/class.calendar.inc.php
+++ b/calendar/inc/class.calendar.inc.php
@@ -220,42 +220,67 @@ class calendar extends calendar_
 		global $phpgw_info;
 
 		$weekday = $this->day_of_week($year,$month,$day);
-		if ($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Monday')
+		switch($phpgw_info['user']['preferences']['calendar']['weekdaystarts'])
 		{
-			$days = Array(
-				0 => 'Mon',
-				1 => 'Tue',
-				2 => 'Wed',
-				3 => 'Thu',
-				4 => 'Fri',
-				5 => 'Sat',
-				6 => 'Sun'
-			);
-			switch($weekday)
-			{
-				case 0:
-					$sday = mktime(2,0,0,$month,$day - 6,$year);
-					break;
-				case 1:
-					$sday = mktime(2,0,0,$month,$day,$year);
-					break;
-				default:
-					$sday = mktime(2,0,0,$month,$day - ($weekday - 1),$year);
-					break;
-			}
-		}
-		else
-		{
-			$days = Array(
-				0 => 'Sun',
-				1 => 'Mon',
-				2 => 'Tue',
-				3 => 'Wed',
-				4 => 'Thu',
-				5 => 'Fri',
-				6 => 'Sat'
-			);
-			$sday = mktime(2,0,0,$month,$day - $weekday,$year);
+			case 'Monday':
+				$days = Array(
+					0 => 'Mon',
+					1 => 'Tue',
+					2 => 'Wed',
+					3 => 'Thu',
+					4 => 'Fri',
+					5 => 'Sat',
+					6 => 'Sun'
+				);
+				switch($weekday)
+				{
+					case 0:
+						$sday = mktime(2,0,0,$month,$day - 6,$year);
+						break;
+					case 1:
+						$sday = mktime(2,0,0,$month,$day,$year);
+						break;
+					default:
+						$sday = mktime(2,0,0,$month,$day - ($weekday - 1),$year);
+						break;
+				}
+				break;
+			case 'Sunday':
+				$days = Array(
+					0 => 'Sun',
+					1 => 'Mon',
+					2 => 'Tue',
+					3 => 'Wed',
+					4 => 'Thu',
+					5 => 'Fri',
+					6 => 'Sat'
+				);
+				$sday = mktime(2,0,0,$month,$day - $weekday,$year);
+				break;
+// The following is for Arabic support.....
+			case 'Saturday':
+				$days = Array(
+					0 => 'Sat',
+					1 => 'Sun',
+					2 => 'Mon',
+					3 => 'Tue',
+					4 => 'Wed',
+					5 => 'Thu',
+					6 => 'Fri'
+				);
+				switch($weekday)
+				{
+					case 0:
+						$sday = mktime(2,0,0,$month,$day - 1,$year);
+						break;
+					case 6:
+						$sday = mktime(2,0,0,$month,$day,$year);
+						break;
+					default:
+						$sday = mktime(2,0,0,$month,$day - ($weekday + 1),$year);
+						break;
+				}
+				break;				
 		}
 
 		$this->days = $days;
diff --git a/calendar/preferences.php b/calendar/preferences.php
index 5773005023..1e35162084 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -120,6 +120,8 @@
 	$str = '<select name="weekdaystarts">'
 		. '<option value="Monday"'.$t_weekday['Monday'].'>'.lang('Monday').'</option>'
 		. '<option value="Sunday"'.$t_weekday['Sunday'].'>'.lang('Sunday').'</option>'
+// The following is for Arabic support.....
+		. '<option value="Saturday"'.$t_weekday['Saturday'].'>'.lang('Saturday').'</option>'
 		. '</select>';
 	display_item(lang('weekday starts on'),$str);