diff --git a/app/views/admin/calendars/_form.html.erb b/app/views/admin/calendars/_form.html.erb
index 60c920c..c919b4a 100644
--- a/app/views/admin/calendars/_form.html.erb
+++ b/app/views/admin/calendars/_form.html.erb
@@ -172,6 +172,12 @@
       <%=f.select :frequency, (1..30).to_a,{},:class=>"span2" %>
     </div>
   </div>
+  <div class="control-group">
+    <%= f.label t("calendar.recurring_end_date"), :class=>"control-label" %>
+    <div class="controls">
+      <%= f.datetime_picker :recurring_end_date, :class => "input-large", :placeholder => data_format, :new_record => false, :format => data_format %>
+    </div>
+  </div>
 </div>
 
 <div class="control-group last">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cfa8769..0eef5c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,6 @@
 en:
   calendar:
+     recurring_end_date: "Recurring End Date"
      "12_hour_clock": "12 hour clock"
      "24_hour_clock": "24 hour clock"
      time_type: "Time Type"
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 5742ffb..22eea0a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -1,5 +1,6 @@
 zh_tw:
   calendar:
+     recurring_end_date: "週期結束時間"
      "12_hour_clock": "12小時制"
      "24_hour_clock": "24小時制"
      time_type: "時間格式"