diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a278873de..a038b1b6d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,7 @@
+# Riak KV 3.2.1 Release Notes
+
+Release of Riak KV 3.2, with the addition of changes made in [Riak KV 3.0.13](#riak-kv-3013-release-notes).
+
 # Riak KV 3.2.0 Release Notes
 
 This release is an OTP uplift release.  Whereas release 3.0.1 supports OTP 22; the intention is for Release 3.2.n to support OTP 22, OTP 24, and OTP 25.  There are potential throughput benefits of up to 10% when using OTP 24/25 rather than OTP 22 where load is CPU bound.  OTP 25 is currently the preferred platform for this release.
@@ -14,6 +18,26 @@ When building from source, the `snappy` dependancy is now made rather than fetch
 
 In this release, tagging of individual dependencies has not been used.  Building consistently with the correct versions of dependencies is therefore dependent on the commit references being used from within the rebar.lock file.
 
+# Riak KV 3.0.13 Release Notes
+
+This release is focused on improving the reliability of handoffs.  The speed of handoffs is critical to the recovery times of nodes following failure, and also to the time necessary to expand or contract the cluster.  Controlling the speed can be managed by increasing concurrency (using `riak admin transfer-limit <limit>`), but this can often lead to handoff unreliability due to timeouts.
+
+- The main [handoff process has been refactored](https://github.com/basho/riak_core/pull/995) to remove some deprecated messages, simplify the naming of configuration items, improve the logging of handoffs and increase the frequency of handoff sync messages.  More frequent sync messages should make the flow of handoffs from the sender more responsive to pressure at the receiver.
+
+-  On joining a node to a cluster, there will now be an attempt to exchange metadata with the joining node before the join is staged.  This should reduce the probability of events failing immediately after join, as bucket types had not yet been replicated to the joining node.
+
+- A [new configuration option has been added](https://github.com/basho/riak_kv/blob/fbb53630645e53af053228d526caa3c86f304066/priv/riak_kv.schema#L1469-L1487) to change Riak to only commit read repair on primary (not fallback) vnodes.  In short-term failures, enabling this option will reduce the time taken for hinted handoff to complete following recovery of a failed node - as now the handoff will contain only objects changed for that partition during the outage.  With the default setting of `disabled`; fallback nodes will also contain each object fetched during the outage, in-line with the behaviour in previous releases.
+
+- A [fix has been implemented in leveled](https://github.com/martinsumner/leveled/pull/390) to reduce failures and inefficiencies when re-building the ledger key store from the object Journal, in situations where there has been a high volume of object churn.
+
+- Some [helper functions have been added to riak_client](https://github.com/basho/riak_kv/blob/fbb53630645e53af053228d526caa3c86f304066/src/riak_client.erl#L949-L993), to simplify some operational tasks.  These functions can be called from `riak remote_console`, e.g. `riak_client:repair_node().` - which replaces the series of commands previously required to run partition repair across all partitions on a node. `riak_client:tictacaae_suspend_node().` may be used to suspend Tictacaae AAE exchanges on a node following a failure, so that they can be re-enabled using `riak_client:tictacaae_resume_node().` once handoffs have been completed.
+
+There are still [outstanding](https://github.com/basho/riak_kv/issues/1846) [issues](https://github.com/basho/riak_core/issues/996) related to handoffs.
+
+The release also includes a [significant change to the HTTP API](https://github.com/basho/riak_kv/issues/1849).  In previous releases PUT, POST and DELETE requests would all GET the object prior to starting the PUT process.  This is in contrast to the Protocol Buffers API which would only GET the object in case where conditions were passed in the put (e.g. `if_none_match` or `if_not_modified`).  These two APIs now have the same non-functional behaviour, the HTTP API will no longer request a GET before the PUT if the request does not contain a condition (e.g. using `If-None-Match`, `If-Match`, `If-Modified-Since` as well as a new bespoke condition `X-Riak-If-Not-Modified`).
+
+A vector clock being passed on a PUT using the `X-Riak-If-Not-Modified` header, will return a `409:Conflict` should the passed vector clock not match the clock found prior to updating the object.  This will work as the PB API `if_not_modified` option.  This is still an eventually consistent condition, parallel updates may still lead to siblings when `{allow_mult, true}`.
+
 # Riak KV 3.0.12 Release Notes
 
 This is a general release of changes and fixes:
diff --git a/rebar.config b/rebar.config
index cecd5daf5..7a772b9d3 100644
--- a/rebar.config
+++ b/rebar.config
@@ -41,7 +41,7 @@
     ]}
 ]}.
 
-{relx, [{release, {riak, "3.2.0"},
+{relx, [{release, {riak, "3.2.1"},
     [kernel,
      stdlib,
      public_key,
diff --git a/rebar.lock b/rebar.lock
deleted file mode 100644
index a2c8e3594..000000000
--- a/rebar.lock
+++ /dev/null
@@ -1,164 +0,0 @@
-{"1.2.0",
-[{<<"basho_stats">>,
-  {git,"https://github.com/basho/basho_stats.git",
-       {ref,"3b33ac15e11cc88e2fc676a1e2d31b80bd02bea6"}},
-  2},
- {<<"bear">>,{pkg,<<"bear">>,<<"1.0.0">>},4},
- {<<"bitcask">>,
-  {git,"https://github.com/basho/bitcask.git",
-       {ref,"d84c8d913713da8f02403431217405f84ee1ba22"}},
-  1},
- {<<"canola">>,
-  {git,"https://github.com/basho/canola",
-       {ref,"2507f698b4dc1156b07dbf568fc651730942fe73"}},
-  1},
- {<<"clique">>,
-  {git,"https://github.com/basho/clique.git",
-       {ref,"3929fa5aeed341b407e16479626ff6b9dddf2ea3"}},
-  2},
- {<<"cluster_info">>,
-  {git,"https://github.com/basho/cluster_info",
-       {ref,"55b12ebb60883766fd0077dac43b266fb5eb6c69"}},
-  0},
- {<<"cuttlefish">>,
-  {git,"https://github.com/basho/cuttlefish.git",
-       {ref,"cb3df6a917ee93374de2b881e138e3dc6e9bf5cf"}},
-  3},
- {<<"ebloom">>,
-  {git,"https://github.com/basho/ebloom.git",
-       {ref,"3c25f9ef61a73d5f1d2c2601da464dd03975721d"}},
-  1},
- {<<"eleveldb">>,
-  {git,"https://github.com/basho/eleveldb.git",
-       {ref,"ea439b0ac8c7a27d5cfba39b9b4466e875fabe93"}},
-  2},
- {<<"exometer_core">>,
-  {git,"https://github.com/Feuerlabs/exometer_core.git",
-       {ref,"66c287e24ceff337f622e3f58e0b4a3ab9ced0f0"}},
-  2},
- {<<"folsom">>,{pkg,<<"folsom">>,<<"1.0.0">>},3},
- {<<"getopt">>,
-  {git,"https://github.com/martinsumner/getopt.git",
-       {ref,"5d2b27dab5d31669764dc759e44c2d96cac01a4e"}},
-  4},
- {<<"hut">>,{pkg,<<"hut">>,<<"1.3.0">>},3},
- {<<"hyper">>,
-  {git,"https://github.com/basho/hyper",
-       {ref,"d0bf3d67fd17b8ed2610b266aebd54b1027ea916"}},
-  1},
- {<<"ibrowse">>,
-  {git,"https://github.com/basho/ibrowse.git",
-       {ref,"cdde6fe5e80ce71e7b5570e40a45d9f862721499"}},
-  2},
- {<<"kv_index_tictactree">>,
-  {git,"https://github.com/martinsumner/kv_index_tictactree.git",
-       {ref,"493f94ba24028d823772665c244d33728eca2a6e"}},
-  1},
- {<<"leveled">>,
-  {git,"https://github.com/martinsumner/leveled",
-       {ref,"a033e280e67931582cc9625993268db126abb4ff"}},
-  2},
- {<<"lz4">>,
-  {git,"https://github.com/martinsumner/erlang-lz4",
-       {ref,"d407af5de71303b8e381df718d2e5d05eb775c59"}},
-  3},
- {<<"mochiweb">>,
-  {git,"https://github.com/basho/mochiweb.git",
-       {ref,"adb632e96d0256fdb9e4c22c3523dbd7d98c4ec1"}},
-  2},
- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.1">>},3},
- {<<"pbkdf2">>,
-  {git,"https://github.com/basho/erlang-pbkdf2.git",
-       {ref,"7e9bd5fcd3cc3062159e4c9214bb628aa6feb5ca"}},
-  2},
- {<<"poolboy">>,
-  {git,"https://github.com/basho/poolboy.git",
-       {ref,"d775915c446c9dd251af5bf70e6cfc4beb83d557"}},
-  2},
- {<<"ranch">>,
-  {git,"https://github.com/ninenines/ranch.git",
-       {ref,"a692f44567034dacf5efcaa24a24183788594eb7"}},
-  1},
- {<<"recon">>,
-  {git,"https://github.com/ferd/recon",
-       {ref,"34194da6d9f8ed25f274e0ebb098dc9e95bcf547"}},
-  1},
- {<<"redbug">>,
-  {git,"https://github.com/massemanet/redbug",
-       {ref,"09ee7142f0fcab99151efb1fc405a067f1b15b56"}},
-  1},
- {<<"rhc">>,
-  {git,"https://github.com/basho/riak-erlang-http-client",
-       {ref,"7c5817003645b94f3361b7971f6caa4ba2e21965"}},
-  1},
- {<<"riak_api">>,
-  {git,"https://github.com/basho/riak_api.git",
-       {ref,"18fa6167e22649386c53b08017069c3ae66f3cb7"}},
-  1},
- {<<"riak_auth_mods">>,
-  {git,"https://github.com/basho/riak_auth_mods",
-       {ref,"c9b88ea685e3fe7f327aaeeda207ea3fed7883cd"}},
-  0},
- {<<"riak_core">>,
-  {git,"https://github.com/basho/riak_core.git",
-       {ref,"3092223dbce303bf35511823e986305a1e39fb56"}},
-  1},
- {<<"riak_dt">>,
-  {git,"https://github.com/basho/riak_dt.git",
-       {ref,"10855112980da92632c4604430dc707b79af3e42"}},
-  1},
- {<<"riak_ensemble">>,
-  {git,"https://github.com/basho/riak_ensemble",
-       {ref,"d57c457ee738a60153d9307a12f4bc86d10c85bd"}},
-  2},
- {<<"riak_kv">>,
-  {git,"https://github.com/basho/riak_kv",
-       {ref,"2713b89a7442f3a213e8ea4684af1d37b9d305b8"}},
-  0},
- {<<"riak_pb">>,
-  {git,"https://github.com/basho/riak_pb.git",
-       {ref,"7a5e535217c13a32f3041888b0d46e9b4476065c"}},
-  2},
- {<<"riak_pipe">>,
-  {git,"https://github.com/basho/riak_pipe.git",
-       {ref,"63b866011859bc3f774c9a0d477b5faa34de41d9"}},
-  1},
- {<<"riak_repl">>,
-  {git,"https://github.com/basho/riak_repl",
-       {ref,"f27f74ed88465ba440c7118b2e8f8d10e460a4f9"}},
-  0},
- {<<"riak_sysmon">>,
-  {git,"https://github.com/basho/riak_sysmon.git",
-       {ref,"c9640bedc7bc011a10e177922b431b63be661512"}},
-  2},
- {<<"riakc">>,
-  {git,"https://github.com/basho/riak-erlang-client",
-       {ref,"697ea24ce472d6ba72cdf98d7a7ae4d362d28f91"}},
-  2},
- {<<"setup">>,{pkg,<<"setup">>,<<"2.1.0">>},3},
- {<<"sext">>,
-  {git,"https://github.com/uwiger/sext.git",
-       {ref,"c1d93beae5a2d9448a520c31adcb0053c76ef4df"}},
-  1},
- {<<"sidejob">>,
-  {git,"https://github.com/basho/sidejob.git",
-       {ref,"10abce4fc76054c8aad230943b5c1a31b67efc6f"}},
-  1},
- {<<"webmachine">>,
-  {git,"https://github.com/webmachine/webmachine.git",
-       {ref,"92225b82fc702f78cf9d23248023ec841272df80"}},
-  2}]}.
-[
-{pkg_hash,[
- {<<"bear">>, <<"430419C1126B477686CDE843E88BA0F2C7DC5CDF0881C677500074F704339A99">>},
- {<<"folsom">>, <<"50ECC998D2149939F1D5E0AA3E32788F8ED16A58E390D81B5C0BE4CC4EF25589">>},
- {<<"hut">>, <<"71F2F054E657C03F959CF1ACC43F436EA87580696528CA2A55C8AFB1B06C85E7">>},
- {<<"parse_trans">>, <<"6E6AA8167CB44CC8F39441D05193BE6E6F4E7C2946CB2759F015F8C56B76E5FF">>},
- {<<"setup">>, <<"05F69185A5EB71474C9BC6BA892565651EC7507791F85632B7B914DBFE130510">>}]},
-{pkg_hash_ext,[
- {<<"bear">>, <<"157B67901ADF84FF0DA6EAE035CA1292A0AC18AA55148154D8C582B2C68959DB">>},
- {<<"folsom">>, <<"DD6AB97278E94F9E4CFC43E188224A7B8C7EAEC0DD2E935007005177F3EEBB0E">>},
- {<<"hut">>, <<"7E15D28555D8A1F2B5A3A931EC120AF0753E4853A4C66053DB354F35BF9AB563">>},
- {<<"parse_trans">>, <<"620A406CE75DADA827B82E453C19CF06776BE266F5A67CFF34E1EF2CBB60E49A">>},
- {<<"setup">>, <<"EFD072578F0CF85BEA96CAAFFC7ADB0992398272522660A136E10567377071C5">>}]}
-].
diff --git a/rel/files/riak-chkconfig b/rel/files/riak-chkconfig
index a23c824bf..201cf2e40 100755
--- a/rel/files/riak-chkconfig
+++ b/rel/files/riak-chkconfig
@@ -30,3 +30,6 @@ $ERTS_DIR/bin/erl -noshell -noinput \
                   -eval "$CODE"
 
 echo $CUTTLE_CONF
+
+# No explicit exit, assumed to have succeeded
+exit 0