diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index f96384aaa9..d3b6c2c34c 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -29,6 +29,8 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
   this.minDate = dtConfig.minDate ? new Date(dtConfig.minDate) : null;
   this.maxDate = dtConfig.maxDate ? new Date(dtConfig.maxDate) : null;
 
+  var today = new Date();
+
   function getValue(value, defaultValue) {
     return angular.isDefined(value) ? $scope.$parent.$eval(value) : defaultValue;
   }
@@ -47,8 +49,8 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
     return dates;
   }
 
-  function makeDate(date, format, isSelected, isSecondary) {
-    return { date: date, label: dateFilter(date, format), selected: !!isSelected, secondary: !!isSecondary };
+  function makeDate(date, format, isSelected, isSecondary, isToday) {
+    return { date: date, label: dateFilter(date, format), selected: !!isSelected, secondary: !!isSecondary, today: isToday };
   }
 
   this.modes = [
@@ -70,7 +72,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
         var days = getDates(firstDate, numDates), labels = new Array(7);
         for (var i = 0; i < numDates; i ++) {
           var dt = new Date(days[i]);
-          days[i] = makeDate(dt, format.day, (selected && selected.getDate() === dt.getDate() && selected.getMonth() === dt.getMonth() && selected.getFullYear() === dt.getFullYear()), dt.getMonth() !== month);
+          days[i] = makeDate(dt, format.day, (selected && selected.getDate() === dt.getDate() && selected.getMonth() === dt.getMonth() && selected.getFullYear() === dt.getFullYear()), dt.getMonth() !== month, today.setHours(0, 0, 0, 0) === dt.setHours(0, 0, 0, 0));
         }
         for (var j = 0; j < 7; j++) {
           labels[j] = dateFilter(days[j].date, format.dayHeader);
diff --git a/template/datepicker/datepicker.html b/template/datepicker/datepicker.html
index 76cfb6b39e..03051d1215 100644
--- a/template/datepicker/datepicker.html
+++ b/template/datepicker/datepicker.html
@@ -14,7 +14,7 @@
     <tr ng-repeat="row in rows">
       <td ng-show="showWeekNumbers" class="text-center"><em>{{ getWeekNumber(row) }}</em></td>
       <td ng-repeat="dt in row" class="text-center">
-        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{'btn-info': dt.selected}" ng-click="select(dt.date)" ng-disabled="dt.disabled"><span ng-class="{'text-muted': dt.secondary}">{{dt.label}}</span></button>
+        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{'btn-info': dt.selected, 'today': dt.today}" ng-click="select(dt.date)" ng-disabled="dt.disabled"><span ng-class="{'text-muted': dt.secondary}">{{dt.label}}</span></button>
       </td>
     </tr>
   </tbody>