diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
index dcac95b2e..10e843315 100644
--- a/js/bootstrap-datepicker.js
+++ b/js/bootstrap-datepicker.js
@@ -696,8 +696,13 @@
 					this.picker.addClass('datepicker-orient-right');
 					left += width - calendarWidth;
 				} else {
-					// Default to left
-					this.picker.addClass('datepicker-orient-left');
+					if (this.o.rtl) {
+						// Default to right
+						this.picker.addClass('datepicker-orient-right');
+					} else {
+						// Default to left
+						this.picker.addClass('datepicker-orient-left');
+					}
 				}
 			}
 
diff --git a/less/datepicker.less b/less/datepicker.less
index 99d5dffdf..4134abd49 100644
--- a/less/datepicker.less
+++ b/less/datepicker.less
@@ -7,6 +7,7 @@
 	direction: ltr;
 	&&-rtl {
 		direction: rtl;
+		&.dropdown-menu { left: auto; }
 		table tr td span {
 			float: right;
 		}
diff --git a/less/datepicker3.less b/less/datepicker3.less
index 0e850d253..441765c80 100644
--- a/less/datepicker3.less
+++ b/less/datepicker3.less
@@ -6,6 +6,7 @@
 	direction: ltr;
 	&&-rtl {
 		direction: rtl;
+		&.dropdown-menu { left: auto; }
 		table tr td span {
 			float: right;
 		}