diff --git a/rpick-fix-metadata.diff b/rpick-fix-metadata.diff
new file mode 100644
index 0000000..698a3b1
--- /dev/null
+++ b/rpick-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- rpick-0.4.0/Cargo.toml	1970-01-01T00:00:00+00:00
++++ rpick-0.4.0/Cargo.toml	2019-06-19T11:20:06.162667+00:00
+@@ -23,7 +23,7 @@
+ license = "GPL-3.0"
+ repository = "https://gitlab.com/bowlofeggs/rpick"
+ [dependencies.dirs]
+-version = "1.0"
++version = "2"
+ 
+ [dependencies.rand]
+ version = "0.6"
diff --git a/rust-rpick.spec b/rust-rpick.spec
index 309c69d..851e512 100644
--- a/rust-rpick.spec
+++ b/rust-rpick.spec
@@ -1,34 +1,35 @@
-# Generated by rust2rpm
+# Generated by rust2rpm 10
 %bcond_without check
 
 %global crate rpick
 
 Name:           rust-%{crate}
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Helps you pick items from a list by various algorithms
 
 # Upstream license specification: GPL-3.0
 License:        GPLv3
 URL:            https://crates.io/crates/rpick
 Source:         %{crates_source}
+# Initial patched metadata
+# * Update dirs to 2, https://gitlab.com/bowlofeggs/rpick/merge_requests/22
+Patch0:         rpick-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch:      noarch
+%endif
 
 BuildRequires:  rust-packaging
-BuildRequires:  (crate(dirs/default) >= 1.0.0 with crate(dirs/default) < 2.0.0)
-BuildRequires:  (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0)
-BuildRequires:  (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0)
-BuildRequires:  (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0)
-BuildRequires:  (crate(serde_yaml/default) >= 0.8.0 with crate(serde_yaml/default) < 0.9.0)
-BuildRequires:  (crate(structopt/default) >= 0.2.0 with crate(structopt/default) < 0.3.0)
 
-%global _description \
-Helps you pick items from a list by various algorithms. Example uses: pick a\
-restaurant you haven't been to in a while, or an album to listen to.
+%global _description %{expand:
+Helps you pick items from a list by various algorithms. Example uses: pick a
+restaurant you haven't been to in a while, or an album to listen to.}
 
 %description %{_description}
 
+%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 
@@ -38,6 +39,7 @@ Summary:        %{summary}
 %license LICENSE
 %doc README.md
 %{_bindir}/rpick
+%endif
 
 %package        devel
 Summary:        %{summary}
@@ -69,6 +71,9 @@ which use "default" feature of "%{crate}" crate.
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
+%generate_buildrequires
+%cargo_generate_buildrequires
+
 %build
 %cargo_build
 
@@ -81,6 +86,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Wed Jun 19 13:20:06 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.0-2
+- Update dirs to 2
+
 * Sun May 12 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0.
 - https://gitlab.com/bowlofeggs/rpick/blob/0.4.0/CHANGELOG.md
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..4da85be
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/rust.git"
+      dest: rust
+    tests:
+    - rust/cargo-test
+    environment:
+      pkg: rust-rpick