diff --git a/encoding-index-japanese-1.20141219.5-fix-metadata.diff b/encoding-index-japanese-1.20141219.5-fix-metadata.diff
deleted file mode 100644
index c79c41f..0000000
--- a/encoding-index-japanese-1.20141219.5-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- encoding-index-japanese-1.20141219.5/Cargo.toml	2015-04-14T03:31:02+02:00
-+++ encoding-index-japanese-1.20141219.5/Cargo.toml	2017-11-12T10:57:27.761590+01:00
-@@ -12,7 +12,6 @@
- name = "encoding_index_japanese"
- path = "lib.rs"
- 
--[dependencies.encoding_index_tests]
-+[dev-dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
diff --git a/encoding-index-japanese-fix-metadata.diff b/encoding-index-japanese-fix-metadata.diff
new file mode 100644
index 0000000..bb762c7
--- /dev/null
+++ b/encoding-index-japanese-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- encoding-index-japanese-1.20141219.5/Cargo.toml	2015-04-14T03:31:02+02:00
++++ encoding-index-japanese-1.20141219.5/Cargo.toml	2018-11-03T14:54:28.869944+01:00
+@@ -12,7 +12,6 @@
+ name = "encoding_index_japanese"
+ path = "lib.rs"
+ 
+-[dependencies.encoding_index_tests]
++[dev-dependencies.encoding_index_tests]
+ # TODO consider using dev-dependencies instead (Cargo issue #860)
+ version = "0.1.4"
+-path = "../tests"
diff --git a/rust-encoding-index-japanese.spec b/rust-encoding-index-japanese.spec
index 7e0a727..7c03f49 100644
--- a/rust-encoding-index-japanese.spec
+++ b/rust-encoding-index-japanese.spec
@@ -7,9 +7,10 @@
 
 Name:           rust-%{crate}
 Version:        1.20141219.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Index tables for Japanese character encodings
 
+# Upstream license specification: CC0-1.0
 # https://github.com/lifthrasiir/rust-encoding/issues/111
 License:        CC0
 URL:            https://crates.io/crates/encoding-index-japanese
@@ -17,28 +18,43 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 # Initial patched metadata
 # * No paths
 # * Make dev-dependency as dev one
-Patch0:         encoding-index-japanese-1.20141219.5-fix-metadata.diff
+Patch0:         encoding-index-japanese-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(encoding_index_tests) >= 0.1.4 with crate(encoding_index_tests) < 0.2.0)
+BuildRequires:  (crate(encoding_index_tests/default) >= 0.1.4 with crate(encoding_index_tests/default) < 0.2.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Index tables for Japanese character encodings.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Index tables for Japanese character encodings.
+%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
+%{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
@@ -55,10 +71,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Nov 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.20141219.5-5
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20141219.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild