diff --git a/Makefile.PL b/Makefile.PL
new file mode 100644
index 0000000..ed6bdd7
--- /dev/null
+++ b/Makefile.PL
@@ -0,0 +1,26 @@
+use strict;
+use warnings;
+
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+    'NAME' => 'IO::Socket::IP',
+    'VERSION_FROM' => 'lib/IO/Socket/IP.pm',
+    'ABSTRACT_FROM' => 'lib/IO/Socket/IP.pm',
+    'PREREQ_PM' => {
+         'base' => '0',
+         'Carp' => '0',
+         'constant' => '0',
+         'Errno' => '0',
+         'IO::Socket' => 0,
+         'POSIX' => '0',
+         'Socket' => '1.97',
+         'strict' => '0',
+         'warnings' => '0',
+    },
+    'TEST_REQUIRES' => {
+         'IO::Socket::INET' => '0',
+         'Test::More' => '0.88',
+    },
+    'INSTALLDIRS' => 'site',
+);
diff --git a/perl-IO-Socket-IP.spec b/perl-IO-Socket-IP.spec
index 6586db6..6b128e5 100644
--- a/perl-IO-Socket-IP.spec
+++ b/perl-IO-Socket-IP.spec
@@ -7,20 +7,24 @@
 
 Name:           perl-IO-Socket-IP
 Version:        0.41
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Drop-in replacement for IO::Socket::INET supporting both IPv4 and IPv6
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/IO-Socket-IP
 Source0:        https://cpan.metacpan.org/authors/id/P/PE/PEVANS/IO-Socket-IP-%{version}.tar.gz
+# IO-Socket-IP-0.41 moved from ExtUtils::MakeMaker to Module::Build.
+# It will make problems, because IO::Socket::IP is a dual-lived package and
+# needs to be built very early on Perl bootstrap, but Module::Build is not
+# a core package and thus not available in the early stage of bootstrapping.
+# For this reason, we create Makefile.PL and use it instead of Build.PL.
+Source1:        Makefile.PL
 BuildArch:      noarch
 # Build
 BuildRequires:  coreutils
 BuildRequires:  make
 BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
-BuildRequires:  perl(Module::Build) >= 0.4004
-BuildRequires:  perl(strict)
-buildrequires:  perl(warnings)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 # Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
@@ -29,6 +33,8 @@ BuildRequires:  perl(Errno)
 BuildRequires:  perl(IO::Socket)
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Socket) >= 1.97
+BuildRequires:  perl(strict)
+buildrequires:  perl(warnings)
 # Tests only
 BuildRequires:  perl(IO::Socket::INET)
 BuildRequires:  perl(Test::More)
@@ -48,18 +54,19 @@ arguments and methods are provided in a backward-compatible way.
 
 %prep
 %setup -q -n IO-Socket-IP-%{version}
+cp %{SOURCE1} .
 chmod -x lib/IO/Socket/IP.pm
 
 %build
-perl Build.PL --installdirs=vendor
-./Build
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-./Build install --destdir=%{buildroot} --create_packlist=0
+%{make_install}
 %{_fixperms} %{buildroot}/*
 
 %check
-./Build test
+make test
 
 %files
 %license LICENSE
@@ -68,6 +75,9 @@ perl Build.PL --installdirs=vendor
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 17 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.41-2
+- Create Makefile.PL, use ExtUtils::MakeMaker instead of Module::Build
+
 * Wed Sep 16 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.41-1
 - 0.41 bump