diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index 91150c082c..e61fbe894e 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -108,14 +108,17 @@
 
     $phpgw->template->parse("out","edit_entry_begin");
 
+// Brief Description
     $phpgw->template->set_var("field",lang("Brief Description"));
     $phpgw->template->set_var("data","<input name=\"name\" size=\"25\" value=\"".$cal_info->name."\">");
     $phpgw->template->parse("output","list",True);
-    
+
+// Full Description
     $phpgw->template->set_var("field",lang("Full Description"));
     $phpgw->template->set_var("data","<textarea name=\"description\" rows=\"5\" cols=\"40\" wrap=\"virtual\">".$cal_info->description."</textarea>");
     $phpgw->template->parse("output","list",True);
 
+// Date
     $phpgw->template->set_var("field",lang("Date"));
 
     $day_html = "<select name=\"day\">";
@@ -142,6 +145,7 @@
     $phpgw->template->set_var("data",$phpgw->common->dateformatorder($year_html,$month_html,$day_html));
     $phpgw->template->parse("output","list",True);
 
+// Time
     $phpgw->template->set_var("field",lang("Time"));
 
     $amsel = "checked"; $pmsel = "";
@@ -161,10 +165,12 @@
     $phpgw->template->set_var("data",$str);
     $phpgw->template->parse("output","list",True);
 
+// Duration
     $phpgw->template->set_var("field",lang("Duration"));
     $phpgw->template->set_var("data","<input name=\"duration\" size=\"3\" value=\"".(!$cal_info->duration?0:$cal_info->duration)."\"> ".lang("minutes"));
     $phpgw->template->parse("output","list",True);
 
+// Priority
     $phpgw->template->set_var("field",lang("Priority"));
     $str = "<select name=\"priority\">";
     $str .= "<option value=\"1\"";
@@ -195,6 +201,7 @@
     $phpgw->template->set_var("data",$str);
     $phpgw->template->parse("output","list",True);
 
+// Groups
     $phpgw->template->set_var("field",lang("Groups"));
     $str = "<select name=\"n_groups[]\" multiple size=\"5\">";
     $user_groups = $phpgw->accounts->read_group_names();
diff --git a/calendar/matrixselect.php b/calendar/matrixselect.php
index 66c166748d..f6ef6e53bb 100755
--- a/calendar/matrixselect.php
+++ b/calendar/matrixselect.php
@@ -79,6 +79,7 @@
   $phpgw->template->set_var("data",$phpgw->common->dateformatorder($year_html,$month_html,$day_html));
   $phpgw->template->parse("output","list",True);
 
+// View type
   $phpgw->template->set_var("field",lang("View"));
   $str = "<select name=\"view\">";
   $str .= "<option value=\"free/busy\">".lang("free/busy")."</option>\n";
@@ -86,8 +87,8 @@
   $str .= "</select>\n";
   $phpgw->template->set_var("data",$str);
   $phpgw->template->parse("output","list",True);
-  
 
+// Participants
   $phpgw->template->set_var("field",lang("Participants"));
   $db2 = $phpgw->db;
   $db2->query("select account_id,account_lastname,account_firstname "
@@ -114,6 +115,17 @@
   $phpgw->template->set_var("data",$str);
   $phpgw->template->parse("output","list",True);
 
+// Groups
+  $phpgw->template->set_var("field",lang("Groups"));
+  $str = "<select name=\"groups[]\" multiple size=\"5\">";
+  $user_groups = $phpgw->accounts->read_group_names();
+  for ($i=0;$i<count($user_groups);$i++) {
+    $str .= "<option value=\"" . $user_groups[$i][0] . "\">" . $user_groups[$i][1] . "</option>\n";
+  }
+  $str .= "</select>";
+  $phpgw->template->set_var("data",$str);
+  $phpgw->template->parse("output","list",True);
+
   $phpgw->template->set_var("action_url_button","");
   $phpgw->template->set_var("action_text_button",lang("Submit"));
   $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
diff --git a/calendar/viewmatrix.php b/calendar/viewmatrix.php
index b20bcff968..20daca0645 100755
--- a/calendar/viewmatrix.php
+++ b/calendar/viewmatrix.php
@@ -38,6 +38,21 @@
 
   $date = $thisyear.$thismonth.$thisday;
 
+  if(isset($groups) && $groups) {
+    for($i=0;$i<count($groups);$i++) {
+      $phpgw->db->query("SELECT account_id FROM accounts WHERE account_groups LIKE '%,".$groups[$i].":%'");
+      while($phpgw->db->next_record()) {
+	$participating = False;
+	for($j=0;$j<count($participants);$j++) {
+	  if($participants[$j] == $phpgw->db->f("account_id")) {
+	    $participating = True;
+	  }
+	}
+	if(!$participating) $participants[] = $phpgw->db->f("account_id");
+      }
+    }
+  }
+
   switch($view) {
     case "free/busy" :
       echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),$phpgw->calendar->splittime("000000"),0,$participants);
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e34a753f3d..81c7a0873e 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -2,6 +2,7 @@
         - Fixed table locking in admin -> edit account
 	- Added capability to schedule others and not yourself to calendar.
 	- Fixed d/l'ing of files through filemanager.
+	- Enhanced Free/Busy calendar view.
 
 [0.9.6] - Fix user permissions where not being checked properly.