diff --git a/parking_lot_core-fix-metadata.diff b/parking_lot_core-fix-metadata.diff
index 22861ea..76743b1 100644
--- a/parking_lot_core-fix-metadata.diff
+++ b/parking_lot_core-fix-metadata.diff
@@ -1,6 +1,6 @@
---- parking_lot_core-0.3.1/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ parking_lot_core-0.3.1/Cargo.toml	2018-09-10T18:20:51.786647-07:00
-@@ -19,31 +19,14 @@
+--- parking_lot_core-0.3.1/Cargo.toml	1970-01-01T01:00:00+01:00
++++ parking_lot_core-0.3.1/Cargo.toml	2018-10-28T00:31:57.385657+02:00
+@@ -19,31 +19,15 @@
  categories = ["concurrency"]
  license = "Apache-2.0/MIT"
  repository = "https://github.com/Amanieu/parking_lot"
@@ -17,16 +17,16 @@
  
  [dependencies.smallvec]
  version = "0.6"
- 
+-
 -[dependencies.thread-id]
 -version = "3.2.0"
 -optional = true
  [build-dependencies.rustc_version]
  version = "0.2"
  
--[features]
+ [features]
 -deadlock_detection = ["petgraph", "thread-id", "backtrace"]
--nightly = []
+ nightly = []
  [target."cfg(unix)".dependencies.libc]
  version = "0.2.27"
 -[target."cfg(windows)".dependencies.winapi]
diff --git a/rust-parking_lot_core.spec b/rust-parking_lot_core.spec
index 47f1ab9..62f012c 100644
--- a/rust-parking_lot_core.spec
+++ b/rust-parking_lot_core.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Advanced API for creating custom synchronization primitives
 
 # Upstream license specification: Apache-2.0/MIT
@@ -17,31 +17,46 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 # Initial patched metadata
 # * No Windows
 # * No nightly
-# * No optional features
+# * Remove deadlock feature, it depends on some unpackaged crates
 Patch0:         parking_lot_core-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.27 with crate(libc) < 0.3.0)
-BuildRequires:  (crate(rand) >= 0.5.0 with crate(rand) < 0.6.0)
-BuildRequires:  (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0)
-# [build-dependencies]
-BuildRequires:  (crate(rustc_version) >= 0.2.0 with crate(rustc_version) < 0.3.0)
+BuildRequires:  (crate(libc/default) >= 0.2.27 with crate(libc/default) < 0.3.0)
+BuildRequires:  (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0)
+BuildRequires:  (crate(rustc_version/default) >= 0.2.0 with crate(rustc_version/default) < 0.3.0)
+BuildRequires:  (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0)
 
-%description
-%{summary}.
+%global _description \
+An advanced API for creating custom synchronization primitives.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-An advanced API for creating custom synchronization primitives.
+%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-APACHE LICENSE-MIT
+%{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
@@ -58,11 +73,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.1-3
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.1-2
 - Run tests in infrastructure