diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ea26e8..97d937f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+
+## [2.5.1] - 2017-02-01
 ### Added
 - Support for max task retries (#23). See configuration doc for more
 information.
@@ -16,7 +18,7 @@ follow the other properties with similar behavior.
 ### Fixed
 - Automatically assigned task ids are now in the format `dockertask-NNNNN`
 and will increment properly past 99999 but will not be padded after that (#27)
-- Defect in list tasks for non-running tasks (#28)
+- Defect in list tasks for tasks that have not run (#28)
 - Docker temporary directory not being set properly
 - SLES-HPC will now install all Intel MPI related rpms
 - Defect in task file mover for unencrypted credentials (#29)
@@ -226,8 +228,7 @@ and configuration doc for more information.
       task
 - Credential encryption support. Please see the credential encryption guide
 and configuration doc for more information.
-- Experimental support for OpenSSH with
-[HPN patches](https://www.psc.edu/index.php/hpn-ssh) on Ubuntu
+- Experimental support for OpenSSH with HPN patches on Ubuntu
 - Support pool resize up with GlusterFS
 - Support GlusterFS volume options
 - Configurable path to place files generated by `pool add` or `pool asu`
@@ -349,7 +350,8 @@ transfer is disabled
 #### Added
 - Initial release
 
-[Unreleased]: https://github.com/Azure/batch-shipyard/compare/2.5.0...HEAD
+[Unreleased]: https://github.com/Azure/batch-shipyard/compare/2.5.1...HEAD
+[2.5.1]: https://github.com/Azure/batch-shipyard/compare/2.5.0...2.5.1
 [2.5.0]: https://github.com/Azure/batch-shipyard/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/Azure/batch-shipyard/compare/2.3.1...2.4.0
 [2.3.1]: https://github.com/Azure/batch-shipyard/compare/2.3.0...2.3.1
diff --git a/convoy/version.py b/convoy/version.py
index 14d46e2..5e2e5b4 100644
--- a/convoy/version.py
+++ b/convoy/version.py
@@ -22,4 +22,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-__version__ = '2.5.0'
+__version__ = '2.5.1'
diff --git a/docs/00-introduction.md b/docs/00-introduction.md
index d1b454a..d3bf411 100644
--- a/docs/00-introduction.md
+++ b/docs/00-introduction.md
@@ -38,7 +38,8 @@ which are identical VMs provisioned from the Azure cloud. Multiple Batch
 accounts can be provisioned per Azure Subscription, and multiple compute
 pools can be provisioned per Batch account. Please refer to
 [this page](https://docs.microsoft.com/en-us/azure/batch/batch-quota-limit)
-for default service limits.
+for default service limits, including separate core quota limits that only
+apply to the Batch service.
 
 Compute jobs:
 ```
diff --git a/docs/01-batch-shipyard-installation.md b/docs/01-batch-shipyard-installation.md
index 2654ba8..f841c82 100644
--- a/docs/01-batch-shipyard-installation.md
+++ b/docs/01-batch-shipyard-installation.md
@@ -238,9 +238,10 @@ programs must be installed to take advantage of data movement features of
 Batch Shipyard:
 
 1. An SSH client that provides `scp`. OpenSSH with
-[HPN patches](http://www.psc.edu/index.php/hpn-ssh) can be used on the client
-side to further accelerate `scp` to Azure Batch compute nodes where
-`hpn_server_swap` has been set to `true` in the `pool_specification`.
+[HPN patches](https://www.psc.edu/index.php/using-joomla/extensions/templates/atomic/636-hpn-ssh)
+can be used on the client side to further accelerate `scp` to Azure Batch
+compute nodes where `hpn_server_swap` has been set to `true` in the
+`pool_specification`.
 2. `rsync` if `rsync` functionality is needed.
 3. [blobxfer](https://github.com/Azure/blobxfer) if transfering to Azure
 storage. This is automatically installed if `pip install` is used with
diff --git a/docs/10-batch-shipyard-configuration.md b/docs/10-batch-shipyard-configuration.md
index ae824ee..7a578cb 100644
--- a/docs/10-batch-shipyard-configuration.md
+++ b/docs/10-batch-shipyard-configuration.md
@@ -697,9 +697,9 @@ created with pool creation.
     generated RSA keypair and docker tunnel script to. If omitted, the
     current directory is used.
   * (experimental) `hpn_server_swap` property enables an OpenSSH server with
-    [HPN patches](http://www.psc.edu/index.php/hpn-ssh) to be swapped with the
-    standard distribution OpenSSH server. This is not supported on all
-    Linux distributions and may be force disabled.
+    [HPN patches](https://www.psc.edu/index.php/using-joomla/extensions/templates/atomic/636-hpn-ssh)
+    to be swapped with the standard distribution OpenSSH server. This is not
+    supported on all Linux distributions and may be force disabled.
 * (required for `STANDARD_NV` instances, optional for `STANDARD_NC` instances)
 `gpu` property defines additional information for NVIDIA GPU-enabled VMs:
   * `nvidia_driver` property contains the following required members: