diff --git a/.gitignore b/.gitignore
index 03e9efe..1e79928 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /socket2-0.3.16.crate
 /socket2-0.3.17.crate
 /socket2-0.3.19.crate
+/socket2-0.4.0.crate
diff --git a/rust-socket2.spec b/rust-socket2.spec
index 9942743..afa69ef 100644
--- a/rust-socket2.spec
+++ b/rust-socket2.spec
@@ -5,7 +5,7 @@
 %global crate socket2
 
 Name:           rust-%{crate}
-Version:        0.3.19
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Utilities for handling networking sockets
 
@@ -56,40 +56,16 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
-%package     -n %{name}+pair-devel
+%package     -n %{name}+all-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+pair-devel %{_description}
+%description -n %{name}+all-devel %{_description}
 
 This package contains library source intended for building other packages
-which use "pair" feature of "%{crate}" crate.
+which use "all" feature of "%{crate}" crate.
 
-%files       -n %{name}+pair-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package     -n %{name}+reuseport-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+reuseport-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "reuseport" feature of "%{crate}" crate.
-
-%files       -n %{name}+reuseport-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package     -n %{name}+unix-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+unix-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "unix" feature of "%{crate}" crate.
-
-%files       -n %{name}+unix-devel
+%files       -n %{name}+all-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %prep
@@ -107,9 +83,7 @@ which use "unix" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# The test requires networking to be present
-# https://github.com/alexcrichton/socket2-rs/issues/52
-%cargo_test -- -- --skip socket::test::connect_timeout_unrouteable
+%cargo_test
 %endif
 
 %changelog
diff --git a/socket2-fix-metadata.diff b/socket2-fix-metadata.diff
index 37fdb9b..f9862a2 100644
--- a/socket2-fix-metadata.diff
+++ b/socket2-fix-metadata.diff
@@ -1,9 +1,9 @@
---- socket2-0.3.19/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ socket2-0.3.19/Cargo.toml	2021-02-14T13:31:34.622933+00:00
+--- socket2-0.4.0/Cargo.toml	1970-01-01T00:00:00+00:00
++++ socket2-0.4.0/Cargo.toml	2021-03-25T14:58:09.376011+00:00
 @@ -35,6 +35,3 @@
+ all = []
  [target."cfg(unix)".dependencies.libc]
- version = "0.2.66"
- features = ["align"]
+ version = "0.2.86"
 -[target."cfg(windows)".dependencies.winapi]
--version = "0.3.3"
--features = ["handleapi", "ws2def", "ws2ipdef", "ws2tcpip", "minwindef"]
+-version = "0.3.9"
+-features = ["handleapi", "ws2ipdef", "ws2tcpip"]
diff --git a/sources b/sources
index 1d9aefc..3779626 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (socket2-0.3.19.crate) = 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+SHA512 (socket2-0.4.0.crate) = 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d