diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index b61d8ac0dc..a1120c9e06 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -322,7 +322,7 @@
 
     $month_html = "<select name=\"rpt_month\">";
     for ($i = 1; $i <= 12; $i++) {
-      $m = lang($phpgw->common->show_date($cal_info->rpt_end,"F"));
+      $m = lang(date("F",mktime(0,0,0,$i,1,2000)));
       $month_html .= "<option value=\"$i\"" . ($i == intval($phpgw->common->show_date($cal_info->rpt_end,"n")) ? " selected" : "") . ">$m</option>\n";
     }
     $month_html .= "</select>";
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 53c6f565c1..739cab0580 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,7 @@
 	- Added ability for admin to edit any calendar event.
 	- Fixed entries showing improperly on wrong date.
 	- Fixed file uploads through filemanager.
+	- Fixed repeating entries Month select box.
 
 [0.9.7] - Fixed SQL error in tts
         - Fixed table locking in admin -> edit account