diff --git a/source/administration/indexes.txt b/source/administration/indexes.txt
index 1c2d5a9df95..940be788cf6 100644
--- a/source/administration/indexes.txt
+++ b/source/administration/indexes.txt
@@ -458,6 +458,6 @@ of the ``query`` field and the ``msg`` field will indicate if the
 operation is an index build. The ``msg`` field also indicates the
 percent of the build that is complete.
 
-You can only terminate a background index build. If you need to
-terminate an ongoing index build, You can use the
+To
+terminate an ongoing index build, use the
 :method:`db.killOp()` method in the :program:`mongo` shell.
diff --git a/source/faq/indexes.txt b/source/faq/indexes.txt
index 96b00a07844..79cba427ea9 100644
--- a/source/faq/indexes.txt
+++ b/source/faq/indexes.txt
@@ -104,11 +104,12 @@ background. See :ref:`index-creation-operations`.
 
 If you build a large index without the background option, and if doing
 so causes the database to stop responding,
-wait for the index to finish building.
+do one of the following:
 
-.. FUTURE When SERVER-3067 is fixed, this option also will be available:
-   Kill the current operation (see :method:`db.killOp()`). The partial
-   index will be deleted.
+- Wait for the index to finish building.
+
+- Kill the current operation (see :method:`db.killOp()`). The partial
+  index will be deleted.
 
 .. _faq-index-min-max:
 
diff --git a/source/includes/note-foreground-index-kill-limitation.rst b/source/includes/note-foreground-index-kill-limitation.rst
deleted file mode 100644
index a7721193c24..00000000000
--- a/source/includes/note-foreground-index-kill-limitation.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. note:: 
-   
-   You cannot use :method:`db.killOp()` to kill a foreground index
-   build.
diff --git a/source/reference/current-op.txt b/source/reference/current-op.txt
index f4d9c798e71..5a21c13434b 100644
--- a/source/reference/current-op.txt
+++ b/source/reference/current-op.txt
@@ -80,9 +80,6 @@ Operations
 You can use the :method:`db.killOp()` in conjunction with the
 :data:`~currentOp.opid` field to terminate a currently running
 operation.
-
-.. include:: /includes/note-foreground-index-kill-limitation.rst
-
 The following JavaScript operations for the
 :program:`mongo` shell filter the output of
 specific types of operations:
@@ -101,8 +98,6 @@ depending on the kind of operation and its state.
    :method:`db.killOp()` in the :program:`mongo` shell to terminate the
    operation.
 
-   .. include:: /includes/note-foreground-index-kill-limitation.rst
-
 .. data:: currentOp.active
 
    A boolean value, that is ``true`` if the operation has started
diff --git a/source/reference/limits.txt b/source/reference/limits.txt
index d7419b53e43..1c78d0021a3 100644
--- a/source/reference/limits.txt
+++ b/source/reference/limits.txt
@@ -177,12 +177,6 @@ Operations
 
    .. see:: :operator:`$or` and :doc:`/core/geospatial-indexes`.
 
-.. _cannot-kill-foreground:
-.. limit:: Cannot Kill Foreground Index Build
-
-   You cannot use :method:`db.killOp()` to kill a foreground index
-   build.
-
 Naming Restrictions
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/source/reference/method/db.collection.ensureIndex.txt b/source/reference/method/db.collection.ensureIndex.txt
index a805b531175..d33087c2065 100644
--- a/source/reference/method/db.collection.ensureIndex.txt
+++ b/source/reference/method/db.collection.ensureIndex.txt
@@ -154,10 +154,6 @@ db.collection.ensureIndex()
    - Non-background indexing operations will block all other
      operations on a database.
 
-   - You cannot stop a foreground index build once it's begun. See the
-     :ref:`indexes-admin-stop-in-progress-build` for more
-     information.
-
    .. [#] The default index version depends on the version of
       :program:`mongod` running when creating the index. Before version
       2.0, the this value was 0; versions 2.0 and later use version 1.
diff --git a/source/reference/method/db.killOp.txt b/source/reference/method/db.killOp.txt
index a9febf981e5..04857cbf6bc 100644
--- a/source/reference/method/db.killOp.txt
+++ b/source/reference/method/db.killOp.txt
@@ -13,6 +13,4 @@ db.killOp()
    :doc:`/reference/current-op` for full documentation of the output
    of :method:`db.currentOp()`.
 
-   .. include:: /includes/note-foreground-index-kill-limitation.rst
-
    .. include:: /includes/warning-terminating-operations.rst
diff --git a/source/release-notes/2.4.txt b/source/release-notes/2.4.txt
index c20707b7a36..a47f6f08f1b 100644
--- a/source/release-notes/2.4.txt
+++ b/source/release-notes/2.4.txt
@@ -1320,3 +1320,10 @@ key. Consider the following properties when using a hashed shard key:
    Avoid using hashed shard keys when the hashed field has non-integral floating
    point values, see :ref:`hashed indexes <hashed-index-warning>` for
    more information.
+
+``db.killOp()`` Can Now Kill Foreground Index Builds
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The :method:`db.killOp()` method will now terminate a foreground index
+build, in addition to the other operations supported in previous
+versions.