diff --git a/common/changes/minimonthfixes_2017-05-05-17-02.json b/common/changes/minimonthfixes_2017-05-05-17-02.json
new file mode 100644
index 00000000000000..ee8353160ab966
--- /dev/null
+++ b/common/changes/minimonthfixes_2017-05-05-17-02.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Day picker: Ensure we use values from nextProps when props are updated when generating weeks",
+      "type": "patch"
+    }
+  ],
+  "email": "johannao@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx b/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx
index 3e81ecea43dee1..dfb0268ace6666 100644
--- a/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx
+++ b/packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx
@@ -64,11 +64,9 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
   public constructor(props: ICalendarDayProps) {
     super(props);
 
-    const { navigatedDate, selectedDate, today } = props;
-
     this.state = {
       activeDescendantId: getId('DatePickerDay-active'),
-      weeks: this._getWeeks(navigatedDate, selectedDate, today)
+      weeks: this._getWeeks(props)
     };
 
     this._onSelectNextMonth = this._onSelectNextMonth.bind(this);
@@ -79,7 +77,7 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
     const { navigatedDate, selectedDate, today } = nextProps;
 
     this.setState({
-      weeks: this._getWeeks(navigatedDate, selectedDate, today)
+      weeks: this._getWeeks(nextProps)
     });
   }
 
@@ -251,10 +249,10 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
     }
   }
 
-  private _getWeeks(navigatedDate: Date, selectedDate: Date, todayDate: Date): IDayInfo[][] {
-    let { firstDayOfWeek, dateRangeType } = this.props;
+  private _getWeeks(propsToUse: ICalendarDayProps): IDayInfo[][] {
+    let { navigatedDate, selectedDate, dateRangeType, firstDayOfWeek, today } = propsToUse;
     let date = new Date(navigatedDate.getFullYear(), navigatedDate.getMonth(), 1);
-    let today = todayDate || new Date();
+    let todaysDate = today || new Date();
     let weeks = [];
     let week;