diff --git a/heapsize-0.4.2-fix-metadata.diff b/heapsize-0.4.2-fix-metadata.diff
deleted file mode 100644
index c434edd..0000000
--- a/heapsize-0.4.2-fix-metadata.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- heapsize-0.4.2/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ heapsize-0.4.2/Cargo.toml	2018-01-29T14:57:28.337858+01:00
-@@ -22,6 +22,3 @@
- [features]
- flexible-tests = []
- unstable = []
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.4"
--features = ["std", "heapapi"]
diff --git a/heapsize-fix-metadata.diff b/heapsize-fix-metadata.diff
new file mode 100644
index 0000000..8d49f83
--- /dev/null
+++ b/heapsize-fix-metadata.diff
@@ -0,0 +1,14 @@
+--- heapsize-0.4.2/Cargo.toml	1970-01-01T01:00:00+01:00
++++ heapsize-0.4.2/Cargo.toml	2018-10-27T12:35:25.915875+02:00
+@@ -18,10 +18,8 @@
+ description = "Infrastructure for measuring the total runtime size of an object on the heap"
+ license = "MIT/Apache-2.0"
+ repository = "https://github.com/servo/heapsize"
++exclude = ["/.travis.yml", "/appveyor.yml"]
+ 
+ [features]
+ flexible-tests = []
+ unstable = []
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.4"
+-features = ["std", "heapapi"]
diff --git a/rust-heapsize.spec b/rust-heapsize.spec
index f908eb8..485e405 100644
--- a/rust-heapsize.spec
+++ b/rust-heapsize.spec
@@ -7,32 +7,64 @@
 
 Name:           rust-%{crate}
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Infrastructure for measuring the total runtime size of an object on the heap
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/heapsize
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No Windows
-Patch0:         heapsize-0.4.2-fix-metadata.diff
+# * Exclude CI files, https://github.com/servo/heapsize/pull/101
+Patch0:         heapsize-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+Infrastructure for measuring the total runtime size of an object on the heap.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Infrastructure for measuring the total runtime size of an object on the heap.
+%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 %{crate} from crates.io.
+which use "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+unstable-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files       -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -49,13 +81,10 @@ which use %{crate} from crates.io.
 %cargo_test -f flexible-tests
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.2-6
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.2-5
 - Run tests in infrastructure