diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index bc2354f110..2c85631941 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -259,8 +259,10 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
 
         if ( scope.showWeeks ) {
           scope.weekNumbers = [];
-          var weekNumber = getISO8601WeekNumber( scope.rows[0][0].date ),
+          var weekNumber = getISO8601WeekNumber( scope.rows[0][6].date ),
               numWeeks = scope.rows.length;
+          while( scope.weekNumbers.push(weekNumber++) < numWeeks && weekNumber < 53) {}
+          weekNumber = 1;
           while( scope.weekNumbers.push(weekNumber++) < numWeeks ) {}
         }
       };
diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
index b673d162da..20e6c2c959 100644
--- a/src/datepicker/test/datepicker.spec.js
+++ b/src/datepicker/test/datepicker.spec.js
@@ -135,7 +135,7 @@ describe('datepicker directive', function () {
     });
 
     it('renders the week numbers based on ISO 8601', function() {
-      expect(getWeeks()).toEqual(['34', '35', '36', '37', '38', '39']);
+      expect(getWeeks()).toEqual(['35', '36', '37', '38', '39', '40']);
     });
 
     it('value is correct', function() {