diff --git a/rust-serde_json0.8.spec b/rust-serde_json0.8.spec
index c0587d3..4ab3f6c 100644
--- a/rust-serde_json0.8.spec
+++ b/rust-serde_json0.8.spec
@@ -6,39 +6,81 @@
 
 Name:           rust-%{crate}0.8
 Version:        0.8.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        JSON serialization file format
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/serde_json
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 Source1:        https://raw.githubusercontent.com/serde-rs/json/master/LICENSE-APACHE
 Source2:        https://raw.githubusercontent.com/serde-rs/json/master/LICENSE-MIT
 # Initial patched metadata
-Patch0:         serde_json-0.8.6-fix-metadata.diff
+Patch0:         serde_json-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(dtoa) >= 0.4.0 with crate(dtoa) < 0.5.0)
-BuildRequires:  (crate(itoa) >= 0.4.0 with crate(itoa) < 0.5.0)
-BuildRequires:  (crate(linked-hash-map) >= 0.5.0 with crate(linked-hash-map) < 0.6.0)
-BuildRequires:  (crate(num-traits) >= 0.1.32 with crate(num-traits) < 0.2.0)
-BuildRequires:  (crate(serde) >= 0.8.13 with crate(serde) < 0.9.0)
+BuildRequires:  (crate(dtoa/default) >= 0.4.0 with crate(dtoa/default) < 0.5.0)
+BuildRequires:  (crate(itoa/default) >= 0.4.0 with crate(itoa/default) < 0.5.0)
+BuildRequires:  (crate(linked-hash-map/default) >= 0.5.0 with crate(linked-hash-map/default) < 0.6.0)
+BuildRequires:  (crate(linked-hash-map/serde_impl) >= 0.5.0 with crate(linked-hash-map/serde_impl) < 0.6.0)
+BuildRequires:  (crate(num-traits/default) >= 0.1.32 with crate(num-traits/default) < 0.2.0)
+BuildRequires:  (crate(serde/default) >= 0.8.13 with crate(serde/default) < 0.9.0)
+
+%global _description \
+A JSON serialization file format.
 
-%description
-%{summary}.
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A JSON serialization file format.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%{cargo_registry}/%{crate}-%{version}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+linked-hash-map-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+linked-hash-map-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "linked-hash-map" feature of "%{crate}" crate.
+
+%files       -n %{name}+linked-hash-map-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+preserve_order-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+preserve_order-devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "preserve_order" feature of "%{crate}" crate.
+
+%files       -n %{name}+preserve_order-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -61,11 +103,10 @@ touch -d "$t" src/ser.rs
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Fri Nov 09 2018 Josh Stone <jistone@redhat.com> - 0.8.6-6
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/serde_json-0.8.6-fix-metadata.diff b/serde_json-0.8.6-fix-metadata.diff
deleted file mode 100644
index dd05ee4..0000000
--- a/serde_json-0.8.6-fix-metadata.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- serde_json-0.8.6/Cargo.toml	2017-01-18T19:08:50+01:00
-+++ serde_json-0.8.6/Cargo.toml	2017-11-11T07:43:28.537482+01:00
-@@ -10,13 +10,11 @@
- keywords = ["json", "serde", "serialization"]
- 
- [features]
--unstable-testing = ["clippy"]
- preserve_order = ["linked-hash-map", "linked-hash-map/serde_impl"]
- 
- [dependencies]
- serde = "0.8.13"
- num-traits = "~0.1.32"
--clippy = { version = "^0.*", optional = true }
--linked-hash-map = { version = "0.3", optional = true }
--itoa = "0.1"
--dtoa = "0.2"
-+linked-hash-map = { version = "0.5", optional = true }
-+itoa = "0.4"
-+dtoa = "0.4"
diff --git a/serde_json-fix-metadata.diff b/serde_json-fix-metadata.diff
new file mode 100644
index 0000000..0fbeaa8
--- /dev/null
+++ b/serde_json-fix-metadata.diff
@@ -0,0 +1,19 @@
+--- serde_json-0.8.6/Cargo.toml	2017-01-18T10:08:50-08:00
++++ serde_json-0.8.6/Cargo.toml	2018-11-08T17:19:05.187675-08:00
+@@ -10,13 +10,11 @@
+ keywords = ["json", "serde", "serialization"]
+ 
+ [features]
+-unstable-testing = ["clippy"]
+ preserve_order = ["linked-hash-map", "linked-hash-map/serde_impl"]
+ 
+ [dependencies]
+ serde = "0.8.13"
+ num-traits = "~0.1.32"
+-clippy = { version = "^0.*", optional = true }
+-linked-hash-map = { version = "0.3", optional = true }
+-itoa = "0.1"
+-dtoa = "0.2"
++linked-hash-map = { version = "0.5", optional = true }
++itoa = "0.4"
++dtoa = "0.4"