diff --git a/rust-term_size.spec b/rust-term_size.spec
index 5424a2c..45f1fb0 100644
--- a/rust-term_size.spec
+++ b/rust-term_size.spec
@@ -7,35 +7,78 @@
 
 Name:           rust-%{crate}
 Version:        0.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Functions for determining terminal sizes and dimensions
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/term_size
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * clippy is nightly
 # * No windows
-Patch0:         term_size-0.3.1-fix-metadata.diff
+# * Exclude useless files, https://github.com/clap-rs/term_size-rs/pull/22
+Patch0:         term_size-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.20 with crate(libc) < 0.3.0)
+BuildRequires:  (crate(libc/default) >= 0.2.20 with crate(libc/default) < 0.3.0)
 
-%description
-%{summary}.
+%global _description \
+Functions for determining terminal sizes and dimensions.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Functions for determining terminal sizes and dimensions.
+%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 CHANGELOG.md CONTRIBUTORS.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}+debug-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+debug-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "debug" feature of "%{crate}" crate.
+
+%files       -n %{name}+debug-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
@@ -52,13 +95,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md CHANGELOG.md CONTRIBUTORS.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,index.html,justfile}
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.1-6
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.1-5
 - Run tests in infrastructure
 
diff --git a/term_size-0.3.1-fix-metadata.diff b/term_size-fix-metadata.diff
similarity index 55%
rename from term_size-0.3.1-fix-metadata.diff
rename to term_size-fix-metadata.diff
index 69b9355..3777cd1 100644
--- a/term_size-0.3.1-fix-metadata.diff
+++ b/term_size-fix-metadata.diff
@@ -1,6 +1,15 @@
 --- term_size-0.3.1/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ term_size-0.3.1/Cargo.toml	2017-11-15T07:04:57.415123+01:00
-@@ -59,24 +59,15 @@
++++ term_size-0.3.1/Cargo.toml	2018-10-27T12:26:53.038444+02:00
+@@ -14,7 +14,7 @@
+ name = "term_size"
+ version = "0.3.1"
+ authors = ["Kevin K. <kbknapp@gmail.com>", "Benjamin Sago <ogham@bsago.me>"]
+-exclude = []
++exclude = ["/.clog.toml", "/.travis.yml", "/appveyor.yml", "/index.html", "/justfile"]
+ description = "functions for determining terminal sizes and dimensions"
+ documentation = "https://kbknapp.github.io/term_size-rs"
+ readme = "README.md"
+@@ -59,24 +59,13 @@
  debug = false
  debug-assertions = false
  rpath = false
@@ -12,14 +21,14 @@
  debug = []
  default = []
 -lints = ["clippy", "nightly"]
- nightly = []
+-nightly = []
 -travis = ["lints", "nightly"]
  unstable = []
  [target."cfg(not(target_os = \"windows\"))".dependencies.libc]
  version = "~0.2.20"
 -[target."cfg(target_os = \"windows\")".dependencies.kernel32-sys]
 -version = "~0.2.2"
- 
+-
 -[target."cfg(target_os = \"windows\")".dependencies.winapi]
 -version = "~0.2.8"
  [badges.appveyor]