diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff
index cfc3c8a..dc41cc6 100644
--- a/ripgrep-fix-metadata.diff
+++ b/ripgrep-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- ripgrep-0.10.0/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ ripgrep-0.10.0/Cargo.toml	2018-09-09T00:13:34.769746+02:00
++++ ripgrep-0.10.0/Cargo.toml	2018-10-28T08:59:07.921425+01:00
 @@ -46,7 +46,7 @@
  default-features = false
  
diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec
index 6fcd457..1f4d7b9 100644
--- a/rust-ripgrep.spec
+++ b/rust-ripgrep.spec
@@ -5,7 +5,7 @@
 
 Name:           rust-%{crate}
 Version:        0.10.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Line oriented search tool using Rust's regex library
 
 # Upstream license specification: Unlicense OR MIT
@@ -23,35 +23,47 @@ Patch0001:      0001-pcre2-use-jit_if_available.patch
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  ((crate(clap) >= 2.32.0 with crate(clap) < 3.0.0) with crate(clap/suggestions))
-BuildRequires:  (crate(grep) >= 0.2.3 with crate(grep) < 0.3.0)
-BuildRequires:  (crate(ignore) >= 0.4.4 with crate(ignore) < 0.5.0)
-BuildRequires:  (crate(lazy_static) >= 1.1.0 with crate(lazy_static) < 2.0.0)
-BuildRequires:  (crate(log) >= 0.4.5 with crate(log) < 0.5.0)
-BuildRequires:  (crate(num_cpus) >= 1.8.0 with crate(num_cpus) < 2.0.0)
-BuildRequires:  (crate(regex) >= 1.0.5 with crate(regex) < 2.0.0)
-BuildRequires:  (crate(serde_json) >= 1.0.23 with crate(serde_json) < 2.0.0)
-BuildRequires:  (crate(termcolor) >= 1.0.3 with crate(termcolor) < 2.0.0)
-# [build-dependencies]
-BuildRequires:  ((crate(clap) >= 2.32.0 with crate(clap) < 3.0.0) with crate(clap/suggestions))
-BuildRequires:  (crate(lazy_static) >= 1.1.0 with crate(lazy_static) < 2.0.0)
+BuildRequires:  (crate(clap/suggestions) >= 2.32.0 with crate(clap/suggestions) < 3.0.0)
+BuildRequires:  (crate(grep/default) >= 0.2.3 with crate(grep/default) < 0.3.0)
+BuildRequires:  (crate(grep/pcre2) >= 0.2.3 with crate(grep/pcre2) < 0.3.0)
+BuildRequires:  (crate(ignore/default) >= 0.4.4 with crate(ignore/default) < 0.5.0)
+BuildRequires:  (crate(lazy_static/default) >= 1.1.0 with crate(lazy_static/default) < 2.0.0)
+BuildRequires:  (crate(log/default) >= 0.4.5 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(num_cpus/default) >= 1.8.0 with crate(num_cpus/default) < 2.0.0)
+BuildRequires:  (crate(regex/default) >= 1.0.5 with crate(regex/default) < 2.0.0)
+BuildRequires:  (crate(serde_json/default) >= 1.0.23 with crate(serde_json/default) < 2.0.0)
+BuildRequires:  (crate(termcolor/default) >= 1.0.3 with crate(termcolor/default) < 2.0.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(serde) >= 1.0.77 with crate(serde) < 2.0.0)
-BuildRequires:  (crate(serde_derive) >= 1.0.77 with crate(serde_derive) < 2.0.0)
+BuildRequires:  (crate(serde/default) >= 1.0.77 with crate(serde/default) < 2.0.0)
+BuildRequires:  (crate(serde_derive/default) >= 1.0.77 with crate(serde_derive/default) < 2.0.0)
 %endif
 BuildRequires:  %{_bindir}/a2x
 
-%description
-%{summary}.
+%global _description \
+Line oriented search tool using Rust's regex library.\
+Combines the raw performance of grep with the usability of the silver searcher.
+
+%description %{_description}
 
 %package     -n %{crate}
 Summary:        %{summary}
 
-%description -n %{crate}
-Line oriented search tool using Rust's regex library. Combines
-the raw performance of grep with the usability of the silver searcher.
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE-MIT UNLICENSE COPYING
+%doc README.md CHANGELOG.md
+%{_bindir}/rg
+%{_mandir}/man1/rg.1*
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/rg.bash
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_functions.d
+%{_datadir}/fish/vendor_functions.d/rg.fish
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_rg
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -76,22 +88,10 @@ the raw performance of grep with the usability of the silver searcher.
 %cargo_test -a
 %endif
 
-%files       -n %{crate}
-%license LICENSE-MIT UNLICENSE COPYING
-%doc README.md CHANGELOG.md
-%{_bindir}/rg
-%{_mandir}/man1/rg.1*
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/rg.bash
-%dir %{_datadir}/fish
-%dir %{_datadir}/fish/vendor_functions.d
-%{_datadir}/fish/vendor_functions.d/rg.fish
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_rg
-
 %changelog
+* Sun Oct 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.10.0-4
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.10.0-3
 - Infra can't run tests