diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9360cfb62..dc0ec05301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ incremented for features.
 
 ## [Unreleased]
 
+## [0.4.0] - 2021-04-04
+
 ## Features
 
 * cli: Specify test files to run ([#118](https://github.com/project-serum/anchor/pull/118)).
diff --git a/Cargo.lock b/Cargo.lock
index 59f15a4c1d..446bc20c0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,7 +44,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-access-control"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -56,7 +56,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-account"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-error"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "proc-macro2 1.0.24",
@@ -77,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-event"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -88,7 +88,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-interface"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -100,7 +100,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-program"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -111,7 +111,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-attribute-state"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-cli"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-lang",
  "anchor-syn",
@@ -146,7 +146,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-client"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-lang",
  "anyhow",
@@ -158,7 +158,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-derive-accounts"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-syn",
  "anyhow",
@@ -169,7 +169,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-lang"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-attribute-access-control",
  "anchor-attribute-account",
@@ -187,7 +187,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-spl"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anchor-lang",
  "solana-program",
@@ -196,7 +196,7 @@ dependencies = [
 
 [[package]]
 name = "anchor-syn"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "bs58",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e4fbd9ef14..838325c6d6 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-cli"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["armaniferrante <armaniferrante@gmail.com>"]
 edition = "2018"
 
diff --git a/cli/src/template.rs b/cli/src/template.rs
index 445f60aac3..36eaaf64a6 100644
--- a/cli/src/template.rs
+++ b/cli/src/template.rs
@@ -28,7 +28,7 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.3.0"
+anchor-lang = "0.4.0"
 "#,
         name,
         name.to_snake_case(),
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 1b44430b4d..a26cccd344 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "anchor-client"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 edition = "2018"
 license = "Apache-2.0"
 description = "Rust client for Anchor programs"
 
 [dependencies]
-anchor-lang = { path = "../lang", version = "0.3.0" }
+anchor-lang = { path = "../lang", version = "0.4.0" }
 anyhow = "1.0.32"
 regex = "1.4.5"
 solana-client = "1.6.3"
diff --git a/docs/src/getting-started/installation.md b/docs/src/getting-started/installation.md
index a64b8ce381..7dab6ac1a0 100644
--- a/docs/src/getting-started/installation.md
+++ b/docs/src/getting-started/installation.md
@@ -15,7 +15,7 @@ rustup component add rustfmt
 
 ## Install Solana
 
-See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. Version 1.5.5 is required. On macOS and Linux,
+See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. Version 1.6.3 is required. On macOS and Linux,
 
 ```bash
 sh -c "$(curl -sSfL https://release.solana.com/v1.6.3/install)"
@@ -34,7 +34,7 @@ npm install -g mocha
 For now, we can use Cargo to install the CLI.
 
 ```bash
-cargo install --git https://github.com/project-serum/anchor anchor-cli --locked
+cargo install --git https://github.com/project-serum/anchor --tag v0.4.0 anchor-cli --locked
 ```
 
 On Linux systems you may need to install additional dependencies. On Ubuntu,
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
index 430f480fb2..726255f61b 100644
--- a/lang/Cargo.toml
+++ b/lang/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-lang"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 edition = "2018"
@@ -12,14 +12,14 @@ derive = []
 default = []
 
 [dependencies]
-anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.3.0" }
-anchor-attribute-account = { path = "./attribute/account", version = "0.3.0" }
-anchor-attribute-error = { path = "./attribute/error", version = "0.3.0" }
-anchor-attribute-program = { path = "./attribute/program", version = "0.3.0" }
-anchor-attribute-state = { path = "./attribute/state", version = "0.3.0" }
-anchor-attribute-interface = { path = "./attribute/interface", version = "0.3.0" }
-anchor-derive-accounts = { path = "./derive/accounts", version = "0.3.0" }
-anchor-attribute-event = { path = "./attribute/event", version = "0.3.0" }
+anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.4.0" }
+anchor-attribute-account = { path = "./attribute/account", version = "0.4.0" }
+anchor-attribute-error = { path = "./attribute/error", version = "0.4.0" }
+anchor-attribute-program = { path = "./attribute/program", version = "0.4.0" }
+anchor-attribute-state = { path = "./attribute/state", version = "0.4.0" }
+anchor-attribute-interface = { path = "./attribute/interface", version = "0.4.0" }
+anchor-derive-accounts = { path = "./derive/accounts", version = "0.4.0" }
+anchor-attribute-event = { path = "./attribute/event", version = "0.4.0" }
 borsh = "0.8.2"
 solana-program = "1.6.3"
 thiserror = "1.0.20"
diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml
index 26d629ee70..9ffba9366a 100644
--- a/lang/attribute/access-control/Cargo.toml
+++ b/lang/attribute/access-control/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-access-control"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,5 +15,5 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0" }
+anchor-syn = { path = "../../syn", version = "0.4.0" }
 regex = "1.0"
\ No newline at end of file
diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml
index 798e805144..2a2a15dfbe 100644
--- a/lang/attribute/account/Cargo.toml
+++ b/lang/attribute/account/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-account"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,4 +15,4 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] }
+anchor-syn = { path = "../../syn", version = "0.4.0", features = ["hash"] }
diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml
index f14b2d1265..7712226877 100644
--- a/lang/attribute/error/Cargo.toml
+++ b/lang/attribute/error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-error"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -14,4 +14,4 @@ proc-macro = true
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
-anchor-syn = { path = "../../syn", version = "0.3.0" }
\ No newline at end of file
+anchor-syn = { path = "../../syn", version = "0.4.0" }
\ No newline at end of file
diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml
index eb19d05534..c90e358247 100644
--- a/lang/attribute/event/Cargo.toml
+++ b/lang/attribute/event/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-event"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,4 +15,4 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] }
+anchor-syn = { path = "../../syn", version = "0.4.0", features = ["hash"] }
diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml
index 72a52f3b5f..993e90eaaa 100644
--- a/lang/attribute/interface/Cargo.toml
+++ b/lang/attribute/interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-interface"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,5 +15,5 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0" }
+anchor-syn = { path = "../../syn", version = "0.4.0" }
 heck = "0.3.2"
diff --git a/lang/attribute/interface/src/lib.rs b/lang/attribute/interface/src/lib.rs
index 3d15d04924..20cce24684 100644
--- a/lang/attribute/interface/src/lib.rs
+++ b/lang/attribute/interface/src/lib.rs
@@ -22,8 +22,6 @@ use syn::parse_macro_input;
 /// First we define the program that depends on an external interface.
 ///
 /// ```ignore
-/// #![feature(proc_macro_hygiene)]
-///
 /// use anchor_lang::prelude::*;
 ///
 /// #[interface]
@@ -95,8 +93,6 @@ use syn::parse_macro_input;
 /// program will call.
 ///
 /// ```ignore
-/// #![feature(proc_macro_hygiene)]
-///
 /// use anchor_lang::prelude::*;
 /// use counter::Auth;
 ///
diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml
index e83bdb5103..c4055f275f 100644
--- a/lang/attribute/program/Cargo.toml
+++ b/lang/attribute/program/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-program"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,4 +15,4 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0" }
+anchor-syn = { path = "../../syn", version = "0.4.0" }
diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml
index 3bc753c31b..4c92420e15 100644
--- a/lang/attribute/state/Cargo.toml
+++ b/lang/attribute/state/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-attribute-state"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,4 +15,4 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0" }
+anchor-syn = { path = "../../syn", version = "0.4.0" }
diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml
index df5d08a047..4665396599 100644
--- a/lang/derive/accounts/Cargo.toml
+++ b/lang/derive/accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-derive-accounts"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
@@ -15,4 +15,4 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0.60", features = ["full"] }
 anyhow = "1.0.32"
-anchor-syn = { path = "../../syn", version = "0.3.0" }
+anchor-syn = { path = "../../syn", version = "0.4.0" }
diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml
index 0635b2da1f..5b8a1b393b 100644
--- a/lang/syn/Cargo.toml
+++ b/lang/syn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anchor-syn"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
diff --git a/spl/Cargo.toml b/spl/Cargo.toml
index e5d1c9ce62..46f78ace68 100644
--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "anchor-spl"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 edition = "2018"
 license = "Apache-2.0"
 description = "CPI clients for SPL programs"
 
 [dependencies]
-anchor-lang = { path = "../lang", version = "0.3.0", features = ["derive"] }
+anchor-lang = { path = "../lang", version = "0.4.0", features = ["derive"] }
 spl-token = { version = "3.0.1", features = ["no-entrypoint"] }
 solana-program = "1.6.3"
diff --git a/ts/package.json b/ts/package.json
index 78d65021b6..b4e5f577f8 100644
--- a/ts/package.json
+++ b/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@project-serum/anchor",
-  "version": "0.3.1-beta.3",
+  "version": "0.4.0",
   "description": "Anchor client",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",