diff --git a/backtrace-0.3.8-fix-metadata.diff b/backtrace-fix-metadata.diff
similarity index 82%
rename from backtrace-0.3.8-fix-metadata.diff
rename to backtrace-fix-metadata.diff
index a039004..f05e5ea 100644
--- a/backtrace-0.3.8-fix-metadata.diff
+++ b/backtrace-fix-metadata.diff
@@ -1,6 +1,6 @@
---- backtrace-0.3.8/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ backtrace-0.3.8/Cargo.toml	2018-05-23T11:45:08.960264+02:00
-@@ -20,10 +20,6 @@
+--- backtrace-0.3.9/Cargo.toml	1970-01-01T01:00:00+01:00
++++ backtrace-0.3.9/Cargo.toml	2018-11-02T19:43:45.206434+01:00
+@@ -20,10 +20,7 @@
  readme = "README.md"
  license = "MIT/Apache-2.0"
  repository = "https://github.com/alexcrichton/backtrace-rs"
@@ -8,10 +8,11 @@
 -version = "0.6.0"
 -optional = true
 -
++exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"]
  [dependencies.cfg-if]
  version = "0.1"
  
-@@ -31,22 +27,6 @@
+@@ -31,22 +28,6 @@
  version = "0.2.3"
  optional = true
  default-features = false
@@ -34,7 +35,7 @@
  
  [dependencies.rustc-demangle]
  version = "0.1.4"
-@@ -64,12 +44,8 @@
+@@ -64,12 +45,8 @@
  optional = true
  
  [features]
@@ -48,7 +49,7 @@
  libbacktrace = ["backtrace-sys"]
  libunwind = []
  serialize-rustc = ["rustc-serialize"]
-@@ -80,7 +56,3 @@
+@@ -80,7 +57,3 @@
  optional = true
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
diff --git a/rust-backtrace.spec b/rust-backtrace.spec
index 625040e..2dab7c3 100644
--- a/rust-backtrace.spec
+++ b/rust-backtrace.spec
@@ -6,42 +6,193 @@
 
 Name:           rust-%{crate}
 Version:        0.3.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library to acquire a stack trace (backtrace) at runtime in a Rust program
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/backtrace
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No windows/osx
 # * No addr2line due to backtrace(opt) -> addr2line -> error-chain(opt) -> backtrace 
-Patch0:         backtrace-0.3.8-fix-metadata.diff
+# * Exclude CI files, https://github.com/alexcrichton/backtrace-rs/pull/131
+Patch0:         backtrace-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(backtrace-sys) >= 0.1.17 with crate(backtrace-sys) < 0.2.0)
-BuildRequires:  (crate(cfg-if) >= 0.1.0 with crate(cfg-if) < 0.2.0)
+BuildRequires:  (crate(backtrace-sys/default) >= 0.1.17 with crate(backtrace-sys/default) < 0.2.0)
+BuildRequires:  (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0)
 BuildRequires:  (crate(cpp_demangle) >= 0.2.3 with crate(cpp_demangle) < 0.3.0)
-BuildRequires:  (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
-BuildRequires:  (crate(rustc-demangle) >= 0.1.4 with crate(rustc-demangle) < 0.2.0)
-BuildRequires:  (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0)
-BuildRequires:  (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0)
-BuildRequires:  (crate(serde_derive) >= 1.0.0 with crate(serde_derive) < 2.0.0)
+BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
+BuildRequires:  (crate(rustc-demangle/default) >= 0.1.4 with crate(rustc-demangle/default) < 0.2.0)
+BuildRequires:  (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0)
+BuildRequires:  (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0)
+BuildRequires:  (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0)
 
-%description
-%{summary}.
+%global _description \
+A library to acquire a stack trace (backtrace) at runtime in a Rust program.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A library to acquire a stack trace (backtrace) at runtime in a Rust program.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md
+%{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}+backtrace-sys-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+backtrace-sys-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "backtrace-sys" feature of "%{crate}" crate.
+
+%files       -n %{name}+backtrace-sys-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+cpp_demangle-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cpp_demangle-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "cpp_demangle" feature of "%{crate}" crate.
+
+%files       -n %{name}+cpp_demangle-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+dladdr-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+dladdr-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "dladdr" feature of "%{crate}" crate.
+
+%files       -n %{name}+dladdr-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+libbacktrace-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+libbacktrace-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libbacktrace" feature of "%{crate}" crate.
+
+%files       -n %{name}+libbacktrace-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+libunwind-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+libunwind-devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "libunwind" feature of "%{crate}" crate.
+
+%files       -n %{name}+libunwind-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+rustc-serialize-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rustc-serialize-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "rustc-serialize" feature of "%{crate}" crate.
+
+%files       -n %{name}+rustc-serialize-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files       -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serde_derive-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde_derive-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde_derive" feature of "%{crate}" crate.
+
+%files       -n %{name}+serde_derive-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serialize-rustc-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serialize-rustc-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serialize-rustc" feature of "%{crate}" crate.
+
+%files       -n %{name}+serialize-rustc-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serialize-serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serialize-serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serialize-serde" feature of "%{crate}" crate.
+
+%files       -n %{name}+serialize-serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+unix-backtrace-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+unix-backtrace-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unix-backtrace" feature of "%{crate}" crate.
+
+%files       -n %{name}+unix-backtrace-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -59,12 +210,10 @@ which use %{crate} from crates.io.
 %cargo_test || :
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Fri Nov 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.9-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild