diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index c7c0ec06d6..400d02a4b6 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -383,12 +383,19 @@ function month_name ( $m ) {
     $sql = "SELECT webcal_entry.cal_name, webcal_entry.cal_date, "
 	 . "webcal_entry_repeats.*, webcal_entry.cal_description, "
 	 . "webcal_entry.cal_time,webcal_entry.cal_priority, "
-	 . "webcal_entry.cal_duration "
-	 . "FROM webcal_entry, webcal_entry_repeats, webcal_entry_user "
+	 . "webcal_entry.cal_duration, webcal_entry_groups.groups "
+	 . "FROM webcal_entry, webcal_entry_repeats, webcal_entry_user, webcal_entry_groups "
 	 . "WHERE webcal_entry.cal_id = webcal_entry_repeats.cal_id "
 	 . "AND webcal_entry.cal_id = webcal_entry_user.cal_id "
-	 . "AND webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' "
-	 . "AND webcal_entry.cal_type='M'";
+	 . "AND webcal_entry_groups.cal_id = webcal_entry.cal_id "
+	 . "AND (webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' OR (webcal_entry.cal_access='group' AND (";
+    $group_names = $phpgw->accounts->read_group_names();
+    for ($i=0;$i<count($group_names);$i++) {
+      $sql .= "webcal_entry_groups.groups like '%".$group_names[$i][1]."%'";
+      if (count($group_names) != 0 && $i != count($group_names)-1)
+	$sql .= " OR ";
+    }
+    $sql .= "))) AND webcal_entry.cal_type='M'";
 
     $phpgw->db->query($sql);
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0d7412220e..58a6485344 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,7 +6,8 @@
 	      - Fixed changing of password not getting set in session table
 	      - email now displays "Could not open mailbox" if mailbox could
 	        not be opened (formerly displayed just "mailbox empty")
-	      - Fixed displaying of repeated events by owner
+	      - Fixed displaying of repeated calendar events by owner
+	      - Fixed displaying of calendar events to include group events
 
 [09072000] - Added print icon that allows you to print out a page without having
 	        the navbar. Thanks Sam Wynn Jr <sam.wynn@lmco.com>