diff --git a/Cargo.toml b/Cargo.toml
index d2ea9b51c2..d91f54b25a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,15 @@ version = "0.1.0"
 authors = ["Thomas Daede <tdaede@xiph.org>"]
 edition = "2018"
 build = "build.rs"
-include = ["/src/**", "/Cargo.toml", "/build.rs"]
+include = [
+    "/Cargo.toml",
+    "/LICENSE",
+    "/PATENTS",
+    "/README.md",
+    "/build.rs",
+    "/cbindgen.toml",
+    "/src/**",
+]
 license = "BSD-2-Clause"
 description = "The fastest and safest AV1 encoder"
 readme = "README.md"
@@ -15,7 +23,14 @@ autobins = false
 [features]
 decode_test = ["aom-sys"]
 decode_test_dav1d = ["dav1d-sys"]
-binaries = ["ivf", "y4m", "clap", "scan_fmt", "pretty_env_logger", "better-panic"]
+binaries = [
+    "ivf",
+    "y4m",
+    "clap",
+    "scan_fmt",
+    "pretty_env_logger",
+    "better-panic",
+]
 default = ["binaries", "asm", "signal_support"]
 asm = ["nasm-rs", "cc"]
 signal_support = ["signal-hook"]
@@ -55,25 +70,36 @@ bincode = { version = "1.1", optional = true }
 arrayvec = "0.5"
 better-panic = { version = "0.2", optional = true }
 err-derive = "0.2.1"
-image = { version = "0.22.1", optional = true, default-features = false, features = ["png"] }
 byteorder = { version = "1.3.2", optional = true }
 log = "0.4"
 pretty_env_logger = { version = "0.3", optional = true }
 itertools = "0.8"
 simd_helpers = "0.1"
 
+[dependencies.image]
+version = "0.22.1"
+optional = true
+default-features = false
+features = ["png"]
+
 [dependencies.rust_hawktracer]
 version = "0.5.0"
 features = ["profiling_enabled"]
 optional = true
 
 [build-dependencies]
-nasm-rs = { version = "0.1", path = "crates/nasm_rs/", optional = true, features = ["parallel"] }
 cc = { version = "1.0", optional = true, features = ["parallel"] }
-# Vendored to remove the dependency on `failure`, which takes a long time to build.
+# Vendored to remove the dependency on `failure`,
+# which takes a long time to build.
 vergen = { version = "3", path = "crates/vergen" }
 rustc_version = "0.2"
 
+[build-dependencies.nasm-rs]
+version = "0.1"
+path = "crates/nasm_rs/"
+optional = true
+features = ["parallel"]
+
 [target.'cfg(unix)'.dependencies]
 signal-hook = { version = "0.1.9", optional = true }