diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2ea239aeac..a5d00d95eb 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2b2f61dea3..edeaf8bba7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1021,6 +1021,11 @@ select:focus:required:invalid:focus {
   vertical-align: middle;
   background-color: #eeeeee;
   border: 1px solid #ccc;
+}
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
@@ -1030,7 +1035,8 @@ select:focus:required:invalid:focus {
   background-color: #a9dba9;
   border-color: #46a546;
 }
-.input-prepend .add-on {
+.input-prepend .add-on,
+.input-prepend .btn {
   margin-right: -1px;
 }
 .input-append input,
@@ -1043,7 +1049,8 @@ select:focus:required:invalid:focus {
   border-left-color: #eee;
   border-right-color: #ccc;
 }
-.input-append .add-on {
+.input-append .add-on,
+.input-append .btn {
   margin-left: -1px;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
@@ -1056,13 +1063,15 @@ select:focus:required:invalid:focus {
   -moz-border-radius: 0;
   border-radius: 0;
 }
-.input-prepend.input-append .add-on:first-child {
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
   margin-right: -1px;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
-.input-prepend.input-append .add-on:last-child {
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
   margin-left: -1px;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index 5fb4352361..739b9fa4aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1198,7 +1198,23 @@ For example, <code>section</code> should be wrapped as inline.
               <div class="input-append">
                 <input class="span2" id="appendedInput" size="16" type="text"><span class="add-on">.00</span>
               </div>
-              <p class="help-block">Here's more help text</p>
+              <span class="help-inline">Here's more help text</span>
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="appendedPrependedInput">Append and prepend</label>
+            <div class="controls">
+              <div class="input-prepend input-append">
+                <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
+              </div>
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="appendedPrependedInput">Append with button</label>
+            <div class="controls">
+              <div class="input-append">
+                <input class="span2" id="appendedPrependedInput" size="16" type="text"><button class="btn" type="button">Go!</button>
+              </div>
             </div>
           </div>
           <div class="control-group">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index aba6ef5599..ab9e91572a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1122,7 +1122,23 @@
               <div class="input-append">
                 <input class="span2" id="appendedInput" size="16" type="text"><span class="add-on">.00</span>
               </div>
-              <p class="help-block">{{_i}}Here's more help text{{/i}}</p>
+              <span class="help-inline">{{_i}}Here's more help text{{/i}}</span>
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="appendedPrependedInput">{{_i}}Append and prepend{{/i}}</label>
+            <div class="controls">
+              <div class="input-prepend input-append">
+                <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
+              </div>
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="appendedPrependedInput">{{_i}}Append with button{{/i}}</label>
+            <div class="controls">
+              <div class="input-append">
+                <input class="span2" id="appendedPrependedInput" size="16" type="text"><button class="btn" type="button">Go!</button>
+              </div>
             </div>
           </div>
           <div class="control-group">
diff --git a/less/forms.less b/less/forms.less
index a5e8c761f6..6e1d0fae33 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -387,6 +387,9 @@ select:focus:required:invalid {
     vertical-align: middle;
     background-color: @grayLighter;
     border: 1px solid #ccc;
+  }
+  .add-on,
+  .btn {
     .border-radius(3px 0 0 3px);
   }
   .active {
@@ -395,7 +398,8 @@ select:focus:required:invalid {
   }
 }
 .input-prepend {
-  .add-on {
+  .add-on,
+  .btn {
     margin-right: -1px;
   }
 }
@@ -409,7 +413,8 @@ select:focus:required:invalid {
     border-left-color: #eee;
     border-right-color: #ccc;
   }
-  .add-on {
+  .add-on,
+  .btn {
     margin-left: -1px;
     .border-radius(0 3px 3px 0);
   }
@@ -421,11 +426,13 @@ select:focus:required:invalid {
   .uneditable-input {
     .border-radius(0);
   }
-  .add-on:first-child {
+  .add-on:first-child,
+  .btn:first-child {
     margin-right: -1px;
     .border-radius(3px 0 0 3px);
   }
-  .add-on:last-child {
+  .add-on:last-child,
+  .btn:last-child {
     margin-left: -1px;
     .border-radius(0 3px 3px 0);
   }