diff --git a/.travis.yml b/.travis.yml
index 60a35c1b..cab1b2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ go:
 env:
   global:
     - GO111MODULE=on
-    - TM_VERSION=v0.31.11
+    - TM_VERSION=v0.31.12
     - BUILD_VERSION=$(echo ${TRAVIS_COMMIT} | cut -c 1-10)
     - MAIN_GO_VERSION=1.12.14
     - GORACE="halt_on_error=1"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ad78a37..cf5b4ef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
 ## HEAD
+
+## 1.0.4
+- `bnsd`: Upgrade Tendermint to v0.31.12.
 - `bug`: Fix renew domain handler renews empty string account
 - `feature/account`: Accounts in non super user domains cannot be flushed
 
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
index 3b95d1b6..ba4a3e88 100644
--- a/COMPATIBILITY.md
+++ b/COMPATIBILITY.md
@@ -2,6 +2,7 @@
 
 | Weave | Tendermint |
 |--------|-----------|
+|v1.0.x  | v0.31.12|
 |v0.22.x | v0.31.11|
 |v0.21.x | v0.31.9|
 |v0.20.x | v0.31.5|
@@ -20,6 +21,7 @@
 
 | Weave | Protobuf compatible to previous version| Comments |
 |--------|--------------------|------------------|
+|v1.0.4 | :x:| See [CHANGELOG for 1.0.4](https://github.com/iov-one/weave/blob/master/CHANGELOG.md#104) |
 |v0.20.0 | :heavy_check_mark:| See [CHANGELOG for 0.20.0](https://github.com/iov-one/weave/blob/master/CHANGELOG.md#0200) |
 |v0.19.0 | :x:| See [CHANGELOG for 0.19.0](https://github.com/iov-one/weave/blob/master/CHANGELOG.md#0190) |
 |v0.18.0 | :x:| See [CHANGELOG for 0.18.0](https://github.com/iov-one/weave/blob/master/CHANGELOG.md#0180) |
diff --git a/README.md b/README.md
index 3c524215..225a3d6e 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ For more details on the design goals, see the
 
 * [Go](https://golang.org/doc/install)
 * [docker](https://docs.docker.com/install/)
-* [tendermint 0.31.11](https://github.com/tendermint/tendermint/tree/v0.31.11)
+* [tendermint 0.31.12](https://github.com/tendermint/tendermint/tree/v0.31.12)
   * [Installation](https://github.com/tendermint/tendermint/blob/master/docs/introduction/install.md)
 
 ## Instructions
diff --git a/go.mod b/go.mod
index 801abe22..d3f91bfa 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/tendermint/go-amino v0.15.0
 	github.com/tendermint/iavl v0.12.2
-	github.com/tendermint/tendermint v0.31.11
+	github.com/tendermint/tendermint v0.31.12
 	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
 	go.etcd.io/bbolt v1.3.3 // indirect
 	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
diff --git a/go.sum b/go.sum
index 0b0d4713..1395c818 100644
--- a/go.sum
+++ b/go.sum
@@ -125,8 +125,8 @@ github.com/tendermint/go-amino v0.15.0 h1:TC4e66P59W7ML9+bxio17CPKnxW3nKIRAYsknt
 github.com/tendermint/go-amino v0.15.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
 github.com/tendermint/iavl v0.12.2 h1:Ls5p5VINCM1HRT9g5Vvs2zmDOCU/CCIvIHzd/pZ8P0E=
 github.com/tendermint/iavl v0.12.2/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM=
-github.com/tendermint/tendermint v0.31.11 h1:TIs//4WfEAG4TOZc2eUfJPI3T8KrywXQCCPnGAaM1Wo=
-github.com/tendermint/tendermint v0.31.11/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc=
+github.com/tendermint/tendermint v0.31.12 h1:bZSZod1XoV42/rb9GymVz6JS/a3O4iBLgN6VO3w8fP4=
+github.com/tendermint/tendermint v0.31.12/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=