diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b7621054e8..2155b91cd8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -800,7 +800,8 @@ hr {
   border-bottom: 1px solid #ffffff;
 }
 
-abbr[title] {
+abbr[title],
+abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted #999999;
 }
diff --git a/less/type.less b/less/type.less
index 2d913dde3e..3b428e79de 100644
--- a/less/type.less
+++ b/less/type.less
@@ -159,7 +159,9 @@ hr {
 }
 
 // Abbreviations and acronyms
-abbr[title] {
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted @grayLight;
 }