diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89e1948dc..4cf90ba87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,44 +1,65 @@
 # Changelog
 
-## 0.10.0 (May 18, 2017)
+## 0.10.0 (June 2, 2017)
+
+Includes major updates to configuration, logging, and json serialization.
+Also includes the Grand Repo-Merge of 2017.
 
 BREAKING CHANGES:
 
-- New JSON encoding for `go-crypto` types (using `go-wire/data`):
+- Config and Flags:
+  - The `config` map is replaced with a [`Config` struct](https://github.com/tendermint/tendermint/blob/master/config/config.go#L11), 
+containing substructs: `BaseConfig`, `P2PConfig`, `MempoolConfig`, `ConsensusConfig`, `RPCConfig`
+  - This affects the following flags:
+    - `--seeds` is now `--p2p.seeds`
+    - `--node_laddr` is now `--p2p.laddr`
+    - `--pex` is now `--p2p.pex`
+    - `--skip_upnp` is now `--p2p.skip_upnp`
+    - `--rpc_laddr` is now `--rpc.laddr`
+    - `--grpc_laddr` is now `--rpc.grpc_laddr`
+  - Any configuration option now within a substract must come under that heading in the `config.toml`, for instance:
+    ```
+    [p2p]
+    laddr="tcp://1.2.3.4:46656"
+    
+    [consensus]
+    timeout_propose=1000
+    ```
+  - Use viper and `DefaultConfig() / TestConfig()` functions to handle defaults, and remove `config/tendermint` and `config/tendermint_test`
+  - Change some function and method signatures to 
+  - Change some [function and method signatures](https://gist.github.com/ebuchman/640d5fc6c2605f73497992fe107ebe0b) accomodate new config
+
+- Logger
+  - Replace static `log15` logger with a simple interface, and provide a new implementation using `go-kit`. 
+See our new [logging library](https://github.com/tendermint/tmlibs/log) and [blog post](https://tendermint.com/blog/abstracting-the-logger-interface-in-go) for more details
+  - Levels `warn` and `notice` are removed (you may need to change them in your `config.toml`!)
+  - Change some [function and method signatures](https://gist.github.com/ebuchman/640d5fc6c2605f73497992fe107ebe0b) to accept a logger
+
+- JSON serialization:
+  - Replace `[TypeByte, Xxx]` with `{"type": "some-type", "data": Xxx}` in RPC and all `.json` files by using `go-wire/data`. For instance, a public key is now:
+    ```
+    "pub_key": {
+      "type": "ed25519",
+      "data": "83DDF8775937A4A12A2704269E2729FCFCD491B933C4B0A7FFE37FE41D7760D0"
+    }
+    ```
+  - Remove type information about RPC responses, so `[TypeByte, {"jsonrpc": "2.0", ... }]` is now just `{"jsonrpc": "2.0", ... }`
+  - Change `[]byte` to `data.Bytes` in all serialized types (for hex encoding)
+  - Lowercase the JSON tags in `ValidatorSet` fields
+  - Introduce `EventDataInner` for serializing events
+
+- Other:
+  - Send InitChain message in handshake if `appBlockHeight == 0`
+  - Do not include the `Accum` field when computing the validator hash. This makes the ValidatorSetHash unique for a given validator set, rather than changing with every block (as the Accum changes)
+  - Unsafe RPC calls are not enabled by default. This includes `/dial_seeds`, and all calls prefixed with `unsafe`. Use the `--rpc.unsafe` flag to enable.
 
-```
-"pub_key": {
-  "type": "ed25519",
-  "data": "83DDF8775937A4A12A2704269E2729FCFCD491B933C4B0A7FFE37FE41D7760D0"
-}
-```
-
-- New config
-  - Isolate viper to `cmd/tendermint/commands`
-  - New Config structs in `config/`: `BaseConfig`, `P2PConfig`, `MempoolConfig`, `ConsensusConfig`
-  - Remove config/tendermint and config/tendermint_test. Defaults are handled by viper and `DefaultConfig() / `TestConfig()` functions
-  - Tests do not read config from file
-- New logger (`github.com/tendermint/tmlibs/log`)
-  - Reduced to three levels: `error`, `info`, and `debug`
-  - NOTE: The default in previous versions was `notice`, which is no longer valid. Please change it in the `config.toml`
-  - Per-module log levels
-  - The new default is `state:info,*:error`, which means the `state` package logs at `info` level, and everything else logs at `error` level
-  - No global loggers (loggers are passed into constructors, or preferably set with a `SetLogger` method)
-- RPC serialization cleanup:
-  - Lowercase json names for ValidatorSet fields
-  - No longer uses go-wire, so no more `[TypeByte, XXX]` madness
-  - Responses have no type information
-  - Introduce EventDataInner for serializing events
-- Remove all use of go-wire (and `[TypeByte, XXX]`) in the `genesis.json` and `priv_validator.json`
-- [consensus/abci] Send InitChain message in handshake if `appBlockHeight == 0`
-- [types] `[]byte -> data.Bytes`
-- [types] Do not include the `Accum` field when computing the hash of a validator. This makes the ValidatorSetHash unique for a given validator set, rather than changing with every block (as the Accum changes)
-- A number of functions and methods ahd their signatures modified to accomodate new config and logger. See https://gist.github.com/ebuchman/640d5fc6c2605f73497992fe107ebe0b for comprehensive list. Note many also had `[]byte` arguments changed to `data.Bytes`, but this is not actually breaking.
 
 FEATURES:
 
+- Per-module log levels. For instance, the new default is `state:info,*:error`, which means the `state` package logs at `info` level, and everything else logs at `error` level
 - Log if a node is validator or not in every consensus round
 - Use ldflags to set git hash as part of the version
+- Ignore `address` and `pub_key` fields in `priv_validator.json` and overwrite them with the values derrived from the `priv_key`
 
 IMPROVEMENTS:
 
@@ -46,11 +67,14 @@ IMPROVEMENTS:
 - Update paths for grand repo merge:
   - `go-common -> tmlibs/common`
   - `go-data -> go-wire/data`
-  - All other `go-*` libs, except `go-crypto` and `go-wire`, merged under `tmlibs`
+  - All other `go-` libs, except `go-crypto` and `go-wire`, are merged under `tmlibs`
+- No global loggers (loggers are passed into constructors, or preferably set with a SetLogger method)
 - Return HTTP status codes with errors for RPC responses
+- Limit `/blockchain_info` call to return a maximum of 20 blocks
 - Use `.Wrap()` and `.Unwrap()` instead of eg. `PubKeyS` for `go-crypto` types
-- Color code different instances of the consensus for tests 
 - RPC JSON responses use pretty printing (via `json.MarshalIndent`)
+- Color code different instances of the consensus for tests 
+- Isolate viper to `cmd/tendermint/commands` and do not read config from file for tests
 
 
 ## 0.9.2 (April 26, 2017)
diff --git a/README.md b/README.md
index 34320f9a9..d37ef6357 100644
--- a/README.md
+++ b/README.md
@@ -51,16 +51,19 @@ Yay open source! Please see our [contributing guidelines](https://tendermint.com
 
 ### Sub-projects
 
-* [ABCI](http://github.com/tendermint/abci)
-* [Mintnet-kubernetes](https://github.com/tendermint/tools/tree/master/mintnet-kubernetes)
-* [Go-Wire](http://github.com/tendermint/go-wire)
-* [Go-P2P](http://github.com/tendermint/tendermint/p2p)
-* [Go-Merkle](http://github.com/tendermint/go-merkle)
+* [ABCI](http://github.com/tendermint/abci), the Application Blockchain Interface
+* [Go-Wire](http://github.com/tendermint/go-wire), a deterministic serialization library
+* [Go-Crypto](http://github.com/tendermint/go-crypto), an elliptic curve cryptography library 
+* [TmLibs](http://github.com/tendermint/tmlibs), an assortment of Go libraries
+* [Merkleeyes](http://github.com/tendermint/merkleeyes), a balanced, binary Merkle tree for ABCI apps
+
+### Tools
+* [Deployment, Benchmarking, and Monitoring](https://github.com/tendermint/tools)
 
 ### Applications
 
-* [Ethermint](http://github.com/tendermint/ethermint)
-* [Basecoin](http://github.com/tendermint/basecoin)
+* [Ethermint](http://github.com/tendermint/ethermint): Ethereum on Tendermint
+* [Basecoin](http://github.com/tendermint/basecoin), a cryptocurrency application framework
 
 ### More 
 
diff --git a/scripts/dist.sh b/scripts/dist.sh
index 0f368de97..c144c7fdd 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -19,12 +19,10 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 # Change into that dir because we expect that.
 cd "$DIR"
 
-## Generate the tag.
-#if [ -z "$NOTAG" ]; then
-#  echo "==> Tagging..."
-#  git commit --allow-empty -a -m "Release v$VERSION"
-#  git tag -a -m "Version $VERSION" "v${VERSION}" master
-#fi
+# Delete the old dir
+echo "==> Removing old directory..."
+rm -rf build/pkg
+mkdir -p build/pkg
 
 # Do a hermetic build inside a Docker container.
 docker build -t tendermint/tendermint-builder scripts/tendermint-builder/
diff --git a/scripts/dist_build.sh b/scripts/dist_build.sh
index f75faee58..3e6d5abce 100755
--- a/scripts/dist_build.sh
+++ b/scripts/dist_build.sh
@@ -18,11 +18,6 @@ GIT_IMPORT="github.com/tendermint/tendermint/version"
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
 XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"}
 
-# Delete the old dir
-echo "==> Removing old directory..."
-rm -rf build/pkg
-mkdir -p build/pkg
-
 # Make sure build tools are available.
 make tools
 
diff --git a/scripts/publish.sh b/scripts/publish.sh
index e87fea0d3..3091575ff 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -eu
+set -e
 
 VERSION=$1 
-DIST_DIR=$2 # ./build/dist
+DIST_DIR=./build/dist
 
 # Get the version from the environment, or try to figure it out.
 if [ -z $VERSION ]; then
@@ -14,7 +14,6 @@ if [ -z "$VERSION" ]; then
 fi
 
 # copy to s3
-aws s3 cp --recursive ${DIST_DIR} s3://tendermint/${VERSION} --acl public-read --exclude "*" --include "*.zip" 
-aws s3 cp ${DIST_DIR}/tendermint_${VERSION}_SHA256SUMS s3://tendermint/0.9.0 --acl public-read 
+aws s3 cp --recursive ${DIST_DIR} s3://tendermint/binaries/tendermint/v${VERSION} --acl public-read 
 
 exit 0
diff --git a/version/version.go b/version/version.go
index fe4757b54..494b6a895 100644
--- a/version/version.go
+++ b/version/version.go
@@ -6,7 +6,7 @@ const Fix = "0"
 
 var (
 	// The full version string
-	Version = "0.10.0-rc2"
+	Version = "0.10.0"
 
 	// GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
 	GitCommit string