diff --git a/encoding-0.2.33-fix-metadata.diff b/encoding-fix-metadata.diff
similarity index 70%
rename from encoding-0.2.33-fix-metadata.diff
rename to encoding-fix-metadata.diff
index 0c1f35e..218467b 100644
--- a/encoding-0.2.33-fix-metadata.diff
+++ b/encoding-fix-metadata.diff
@@ -1,6 +1,14 @@
 --- encoding-0.2.33/Cargo.toml	2016-08-28T18:53:46+02:00
-+++ encoding-0.2.33/Cargo.toml	2017-11-13T18:16:28.129620+01:00
-@@ -24,23 +24,18 @@
++++ encoding-0.2.33/Cargo.toml	2018-11-03T15:01:55.026063+01:00
+@@ -10,6 +10,7 @@
+ keywords = ["encoding", "unicode", "charset"]
+ readme = "README.md"
+ license = "MIT"
++exclude = ["/Makefile", "/src/index/*"]
+ 
+ [lib]
+ name = "encoding"
+@@ -24,23 +25,18 @@
  
  [dependencies.encoding-index-singlebyte]
  version = "~1.20141219.5"
diff --git a/rust-encoding.spec b/rust-encoding.spec
index 9b34937..4d40083 100644
--- a/rust-encoding.spec
+++ b/rust-encoding.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.2.33
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Character encoding support for Rust
 
 License:        MIT
@@ -15,34 +15,50 @@ URL:            https://crates.io/crates/encoding
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No paths
-Patch0:         encoding-0.2.33-fix-metadata.diff
+Patch0:         encoding-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(encoding-index-japanese) >= 1.20141219.5 with crate(encoding-index-japanese) < 1.20141220.0)
-BuildRequires:  (crate(encoding-index-korean) >= 1.20141219.5 with crate(encoding-index-korean) < 1.20141220.0)
-BuildRequires:  (crate(encoding-index-simpchinese) >= 1.20141219.5 with crate(encoding-index-simpchinese) < 1.20141220.0)
-BuildRequires:  (crate(encoding-index-singlebyte) >= 1.20141219.5 with crate(encoding-index-singlebyte) < 1.20141220.0)
-BuildRequires:  (crate(encoding-index-tradchinese) >= 1.20141219.5 with crate(encoding-index-tradchinese) < 1.20141220.0)
+BuildRequires:  (crate(encoding-index-japanese/default) >= 1.20141219.5 with crate(encoding-index-japanese/default) < 1.20141220.0)
+BuildRequires:  (crate(encoding-index-korean/default) >= 1.20141219.5 with crate(encoding-index-korean/default) < 1.20141220.0)
+BuildRequires:  (crate(encoding-index-simpchinese/default) >= 1.20141219.5 with crate(encoding-index-simpchinese/default) < 1.20141220.0)
+BuildRequires:  (crate(encoding-index-singlebyte/default) >= 1.20141219.5 with crate(encoding-index-singlebyte/default) < 1.20141220.0)
+BuildRequires:  (crate(encoding-index-tradchinese/default) >= 1.20141219.5 with crate(encoding-index-tradchinese/default) < 1.20141220.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(getopts) >= 0.2.0 with crate(getopts) < 0.3.0)
+BuildRequires:  (crate(getopts/default) >= 0.2.0 with crate(getopts/default) < 0.3.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Character encoding support for Rust.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Character encoding support for Rust.
+%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.txt
+%doc README.md AUTHORS.txt
+%{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
@@ -59,13 +75,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE.txt
-%doc README.md AUTHORS.txt
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/{Makefile,src/index}
-
 %changelog
+* Sat Nov 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.33-5
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.33-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild