diff --git a/memmap-0.6.2-fix-metadata.diff b/memmap-fix-metadata.diff
similarity index 52%
rename from memmap-0.6.2-fix-metadata.diff
rename to memmap-fix-metadata.diff
index ea514e2..f1aec45 100644
--- a/memmap-0.6.2-fix-metadata.diff
+++ b/memmap-fix-metadata.diff
@@ -1,6 +1,11 @@
 --- memmap-0.6.2/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ memmap-0.6.2/Cargo.toml	2018-01-07T02:00:23.956247+01:00
-@@ -23,9 +23,6 @@
++++ memmap-0.6.2/Cargo.toml	2018-10-28T02:57:40.175231+02:00
+@@ -19,13 +19,11 @@
+ keywords = ["mmap", "memory-map", "io", "file"]
+ license = "MIT/Apache-2.0"
+ repository = "https://github.com/danburkert/memmap-rs"
++exclude = ["/ci/*", "/.appveyor.yml", "/.travis.yml"]
+ [dev-dependencies.tempdir]
  version = "0.3"
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
diff --git a/rust-memmap.spec b/rust-memmap.spec
index bdb597d..9591601 100644
--- a/rust-memmap.spec
+++ b/rust-memmap.spec
@@ -7,38 +7,55 @@
 
 Name:           rust-%{crate}
 Version:        0.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cross-platform Rust API for memory-mapped file IO
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/memmap
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No windows
-Patch0:         memmap-0.6.2-fix-metadata.diff
+Patch0:         memmap-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
+BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(tempdir) >= 0.3.0 with crate(tempdir) < 0.4.0)
+BuildRequires:  (crate(tempdir/default) >= 0.3.0 with crate(tempdir/default) < 0.4.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Cross-platform Rust API for memory-mapped file IO.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Cross-platform Rust API for memory-mapped file IO.
+%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-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 "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -55,13 +72,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/ci
-
 %changelog
+* Sun Oct 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.2-6
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.2-5
 - Run tests in infrastructure