diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a0b9ebfe2..a6565dee4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,25 @@ Upcoming Changes
 * Rendezvous Request / Reply
 * Rendezvous Distributed Queues
 
+`0.4.0`_ (2018-07-18)
+---------------------
+
+* Added ``get_field_by_index`` for ``tibrv::Msg``
+* Fixed an early-drop bug where ``TransportBuilder`` was used with
+  optional parameters, the ``network``, ``service`` or ``daemon``
+  strings could be dropped before being handed off to the C library.
+* Fixed examples to build with appropriate feature flags enabled.
+
+Also in this release are two **breaking changes**:
+
+* For consistency with the standard library, in ``TibrvResult`` we have
+  renamed ``and_then`` to ``map`` and introduced a new ``and_then``
+  function which takes a closure returning a ``Result<T, TibrvError>``,
+  while ``map`` now accepts a closure returning ``T``.
+* Added *feature gating* for different versions of the Rendezvous
+  library, see `README.md <https://github.com/bradfier/tibrv-rs/blob/master/README.md>`_
+  for more information.
+
 `0.3.0`_ (2018-06-06)
 ---------------------
 
@@ -40,6 +59,7 @@ Initial public release.
 * First usable release on `crates.io <https://crates.io/crates/tibrv>`_.
 
 
+.. _`0.4.0`: https://github.com/bradfier/tibrv-rs/compare/v0.3.0...v0.4.0
 .. _`0.3.0`: https://github.com/bradfier/tibrv-rs/compare/v0.2.0...v0.3.0
 .. _`0.2.0`: https://github.com/bradfier/tibrv-rs/compare/v0.1.1...v0.2.0
 .. _`0.1.1`: https://github.com/bradfier/tibrv-rs/compare/2947f836...v0.1.1
diff --git a/Cargo.toml b/Cargo.toml
index df2bc2c07..cdb79530e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tibrv"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Richard Bradfield <bradfier@fstab.me>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -21,7 +21,7 @@ travis-ci = { repository = "bradfier/tibrv-rs" }
 chrono = "0.4"
 failure = "^0.1"
 failure_derive = "^0.1"
-tibrv-sys = { version = "0.3", path = "tibrv-sys" }
+tibrv-sys = { version = "0.4.0", path = "tibrv-sys" }
 tokio = { version = "^0.1.3", optional = true }
 mio = { version = "0.6.14", optional = true }
 futures = { version = "0.1.18", optional = true }
diff --git a/tibrv-sys/Cargo.toml b/tibrv-sys/Cargo.toml
index 8de9f5bc9..4c27bc5bc 100644
--- a/tibrv-sys/Cargo.toml
+++ b/tibrv-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tibrv-sys"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Richard Bradfield <bradfier@fstab.me>"]
 links = "tibrv"
 build = "build.rs"