diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9386898f..fd6055b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+## [3.0.4] - 2022-01-04
+
 ### Features
 
 - For very limited cases, like `cargo`, expose `ArgMatches::is_valid_arg` to avoid panicing on undefined arguments
@@ -3037,7 +3039,8 @@ Minimum version of Rust is now v1.13.0 (Stable)
 * **arg**  allow lifetimes other than 'static in arguments ([9e8c1fb9](https://github.com/clap-rs/clap/commit/9e8c1fb9406f8448873ca58bab07fe905f1551e5))
 
 <!-- next-url -->
-[Unreleased]: https://github.com/clap-rs/clap/compare/v3.0.3...HEAD
+[Unreleased]: https://github.com/clap-rs/clap/compare/v3.0.4...HEAD
+[3.0.4]: https://github.com/clap-rs/clap/compare/v3.0.3...v3.0.4
 [3.0.3]: https://github.com/clap-rs/clap/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/clap-rs/clap/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/clap-rs/clap/compare/v3.0.0...v3.0.1
diff --git a/Cargo.toml b/Cargo.toml
index 3f9cfdb3..f91b5ba1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
 
 [package]
 name = "clap"
-version = "3.0.3"
+version = "3.0.4"
 description = "A simple to use, efficient, and full-featured Command Line Argument Parser"
 repository = "https://github.com/clap-rs/clap"
 documentation = "https://docs.rs/clap/"
diff --git a/README.md b/README.md
index e84a25b6..c55d221b 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@
 
 [![Crates.io](https://img.shields.io/crates/v/clap?style=flat-square)](https://crates.io/crates/clap)
 [![Crates.io](https://img.shields.io/crates/d/clap?style=flat-square)](https://crates.io/crates/clap)
-[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/v3.0.3/LICENSE-APACHE)
-[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/v3.0.3/LICENSE-MIT)
+[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/v3.0.4/LICENSE-APACHE)
+[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](https://github.com/clap-rs/clap/blob/v3.0.4/LICENSE-MIT)
 [![Build Status](https://img.shields.io/github/workflow/status/clap-rs/clap/CI/staging?style=flat-square)](https://github.com/clap-rs/clap/actions/workflows/ci.yml?query=branch%3Astaging)
 [![Coverage Status](https://img.shields.io/coveralls/github/clap-rs/clap/master?style=flat-square)](https://coveralls.io/github/clap-rs/clap?branch=master)
 [![Contributors](https://img.shields.io/github/contributors/clap-rs/clap?style=flat-square)](https://github.com/clap-rs/clap/graphs/contributors)
@@ -14,15 +14,15 @@
 Dual-licensed under [Apache 2.0](LICENSE-APACHE) or [MIT](LICENSE-MIT).
 
 1. [About](#about)
-2. Tutorial: [Builder API](https://github.com/clap-rs/clap/blob/v3.0.3/examples/tutorial_builder/README.md),  [Derive API](https://github.com/clap-rs/clap/blob/v3.0.3/examples/tutorial_derive/README.md)
-3. [Examples](https://github.com/clap-rs/clap/blob/v3.0.3/examples/README.md)
+2. Tutorial: [Builder API](https://github.com/clap-rs/clap/blob/v3.0.4/examples/tutorial_builder/README.md),  [Derive API](https://github.com/clap-rs/clap/blob/v3.0.4/examples/tutorial_derive/README.md)
+3. [Examples](https://github.com/clap-rs/clap/blob/v3.0.4/examples/README.md)
 4. [API Reference](https://docs.rs/clap)
-    - [Derive Reference](https://github.com/clap-rs/clap/blob/v3.0.3/examples/derive_ref/README.md)
+    - [Derive Reference](https://github.com/clap-rs/clap/blob/v3.0.4/examples/derive_ref/README.md)
     - [Feature Flags](#feature-flags)
-5. [CHANGELOG](https://github.com/clap-rs/clap/blob/v3.0.3/CHANGELOG.md)
-6. [FAQ](https://github.com/clap-rs/clap/blob/v3.0.3/docs/FAQ.md)
+5. [CHANGELOG](https://github.com/clap-rs/clap/blob/v3.0.4/CHANGELOG.md)
+6. [FAQ](https://github.com/clap-rs/clap/blob/v3.0.4/docs/FAQ.md)
 7. [Questions & Discussions](https://github.com/clap-rs/clap/discussions)
-8. [Contributing](https://github.com/clap-rs/clap/blob/v3.0.3/CONTRIBUTING.md)
+8. [Contributing](https://github.com/clap-rs/clap/blob/v3.0.4/CONTRIBUTING.md)
 8. [Sponsors](#sponsors)
 
 ## About
@@ -59,7 +59,7 @@ fn main() {
 Add this to `Cargo.toml`:
 ```toml
 [dependencies]
-clap = { version = "3.0.3", features = ["derive"] }
+clap = { version = "3.0.4", features = ["derive"] }
 ```
 ```bash
 $ demo --help
diff --git a/src/derive.rs b/src/derive.rs
index a38c0f36..225b5d1d 100644
--- a/src/derive.rs
+++ b/src/derive.rs
@@ -20,7 +20,7 @@ use std::ffi::OsString;
 /// See also [`Subcommand`] and [`Args`].
 ///
 /// See the
-/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.3/examples/derive_ref/README.md)
+/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.4/examples/derive_ref/README.md)
 /// for attributes and best practices.
 ///
 /// **NOTE:** Deriving requires the `derive` feature flag
@@ -285,7 +285,7 @@ pub trait FromArgMatches: Sized {
 /// - `Variant(ChildArgs)`: No attribute is used with enum variants that impl `Args`.
 ///
 /// See the
-/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.3/examples/derive_ref/README.md)
+/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.4/examples/derive_ref/README.md)
 /// for attributes and best practices.
 ///
 /// **NOTE:** Deriving requires the `derive` feature flag
@@ -329,7 +329,7 @@ pub trait Args: FromArgMatches + Sized {
 ///   `Subcommand`.
 ///
 /// See the
-/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.3/examples/derive_ref/README.md)
+/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.4/examples/derive_ref/README.md)
 /// for attributes and best practices.
 ///
 /// **NOTE:** Deriving requires the `derive` feature flag
@@ -373,7 +373,7 @@ pub trait Subcommand: FromArgMatches + Sized {
 /// - Allowing using the `#[clap(default_value_t)]` attribute without implementing `Display`.
 ///
 /// See the
-/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.3/examples/derive_ref/README.md)
+/// [derive reference](https://github.com/clap-rs/clap/blob/v3.0.4/examples/derive_ref/README.md)
 /// for attributes and best practices.
 ///
 /// **NOTE:** Deriving requires the `derive` feature flag