diff --git a/bytecount-0.3.2-fix-metadata.diff b/bytecount-fix-metadata.diff
similarity index 54%
rename from bytecount-0.3.2-fix-metadata.diff
rename to bytecount-fix-metadata.diff
index dcb35d3..630ae45 100644
--- a/bytecount-0.3.2-fix-metadata.diff
+++ b/bytecount-fix-metadata.diff
@@ -1,6 +1,14 @@
 --- bytecount-0.3.2/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ bytecount-0.3.2/Cargo.toml	2018-08-10T14:18:26.466722+02:00
-@@ -26,9 +26,6 @@
++++ bytecount-0.3.2/Cargo.toml	2018-10-28T02:02:14.813005+01:00
+@@ -19,6 +19,7 @@
+ categories = ["algorithms", "no-std"]
+ license = "Apache-2.0/MIT"
+ repository = "https://github.com/llogiq/bytecount"
++exclude = ["/.travis.yml", "/appveyor.yml"]
+ 
+ [lib]
+ bench = false
+@@ -26,9 +27,6 @@
  [[bench]]
  name = "bench"
  harness = false
@@ -10,7 +18,7 @@
  [dev-dependencies.criterion]
  version = "0.2.4"
  
-@@ -39,9 +36,7 @@
+@@ -39,9 +37,7 @@
  version = "0.4"
  
  [features]
diff --git a/rust-bytecount.spec b/rust-bytecount.spec
index 510bb65..6bf3d4b 100644
--- a/rust-bytecount.spec
+++ b/rust-bytecount.spec
@@ -7,39 +7,58 @@
 
 Name:           rust-%{crate}
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Count occurrences of a byte, or the UTF-8 code points, in a byte slice, fast
 
+# Upstream license specification: Apache-2.0/MIT
 License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/bytecount
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No simd
-Patch0:         bytecount-0.3.2-fix-metadata.diff
+# * Exclude CI files, https://github.com/llogiq/bytecount/pull/47
+Patch0:         bytecount-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(criterion) >= 0.2.4 with crate(criterion) < 0.3.0)
-BuildRequires:  (crate(quickcheck) >= 0.6.0 with crate(quickcheck) < 0.7.0)
-BuildRequires:  (crate(rand) >= 0.4.0 with crate(rand) < 0.5.0)
+BuildRequires:  (crate(criterion/default) >= 0.2.4 with crate(criterion/default) < 0.3.0)
+BuildRequires:  (crate(quickcheck/default) >= 0.6.0 with crate(quickcheck/default) < 0.7.0)
+BuildRequires:  (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Count occurrences of a given byte, or the number of UTF-8 code points,\
+in a byte slice, fast.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Count occurrences of a given byte, or the number of UTF-8 code points, in a
-byte slice, fast.
+%description    devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE.Apache2 LICENSE.MIT
+%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
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -56,13 +75,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE.Apache2 LICENSE.MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Sun Oct 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.2-2
+- Adapt to new packaging
+
 * Fri Aug 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.2-1
 - Update to 0.3.2