diff --git a/.gitignore b/.gitignore
index 332cfc7..051d97a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /Alien-Build-1.05.tar.gz
 /Alien-Build-1.10.tar.gz
 /Alien-Build-1.16.tar.gz
+/Alien-Build-1.18.tar.gz
diff --git a/Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch b/Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch
deleted file mode 100644
index 4b51a70..0000000
--- a/Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 5fe836a4bd6b192147c68eb919222eeba3227dae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 8 Sep 2017 11:31:02 +0200
-Subject: [PATCH] Remove redundant pkgconfig implementations
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Only one implementation is required, we selected
-Alien::Build::Plugin::PkgConfig::LibPkgConf. This patch removes other
-ones to decrease number of dependencies.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- MANIFEST                                         |   4 -
- Makefile.PL                                      |   4 +-
- lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm    |  16 +--
- t/01_use.t                                       |   4 -
- t/alien_build_plugin_pkgconfig_negotiate.t       |   2 +-
- t/alien_build_plugin_pkgconfig_negotiate__pick.t | 125 -----------------------
- 6 files changed, 3 insertions(+), 152 deletions(-)
-
-diff --git a/MANIFEST b/MANIFEST
-index 8feff60..2a2dd52 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -146,11 +146,9 @@ lib/Alien/Build/Plugin/Fetch/Local.pm
- lib/Alien/Build/Plugin/Fetch/LocalDir.pm
- lib/Alien/Build/Plugin/Fetch/NetFTP.pm
- lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm
--lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm
- lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm
- lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm
- lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
--lib/Alien/Build/Plugin/PkgConfig/PP.pm
- lib/Alien/Build/Plugin/Prefer.pod
- lib/Alien/Build/Plugin/Prefer/BadVersion.pm
- lib/Alien/Build/Plugin/Prefer/SortVersions.pm
-@@ -217,12 +215,10 @@ t/alien_build_plugin_fetch_lwp.t
- t/alien_build_plugin_fetch_netftp.t
- t/alien_build_plugin_gather_isolatedynamic.t
- t/alien_build_plugin_meta.t
--t/alien_build_plugin_pkgconfig_commandline.t
- t/alien_build_plugin_pkgconfig_libpkgconf.t
- t/alien_build_plugin_pkgconfig_makestatic.t
- t/alien_build_plugin_pkgconfig_negotiate.t
- t/alien_build_plugin_pkgconfig_negotiate__pick.t
--t/alien_build_plugin_pkgconfig_pp.t
- t/alien_build_plugin_prefer_badversion.t
- t/alien_build_plugin_prefer_sortversions.t
- t/alien_build_plugin_probe_cbuilder.t
-diff --git a/Makefile.PL b/Makefile.PL
-index cf47d0f..39b6eb3 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -71,11 +71,9 @@ my %WriteMakefileArgs = (
-     "lib/Alien/Build/Plugin/Fetch/LocalDir.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/LocalDir.pm",
-     "lib/Alien/Build/Plugin/Fetch/NetFTP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/NetFTP.pm",
-     "lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Gather/IsolateDynamic.pm",
--    "lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/CommandLine.pm",
-     "lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm",
-     "lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/MakeStatic.pm",
-     "lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/Negotiate.pm",
--    "lib/Alien/Build/Plugin/PkgConfig/PP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/PP.pm",
-     "lib/Alien/Build/Plugin/Prefer.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer.pod",
-     "lib/Alien/Build/Plugin/Prefer/BadVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/BadVersion.pm",
-     "lib/Alien/Build/Plugin/Prefer/SortVersions.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/SortVersions.pm",
-@@ -182,4 +180,4 @@ sub requires { goto &runtime_requires }
- sub runtime_requires {
-   my ($module, $version_or_range) = @_;
-   _add_prereq(PREREQ_PM => $module, $version_or_range);
--}
-\ No newline at end of file
-+}
-diff --git a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
-index b1845d0..9b43e8d 100644
---- a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
-+++ b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
-@@ -3,9 +3,7 @@ package Alien::Build::Plugin::PkgConfig::Negotiate;
- use strict;
- use warnings;
- use Alien::Build::Plugin;
--use Alien::Build::Plugin::PkgConfig::CommandLine;
- use Alien::Build::Plugin::PkgConfig::LibPkgConf;
--use Alien::Build::Plugin::PkgConfig::PP;
- use Alien::Build::Util qw( _perl_config );
- use Carp ();
- 
-@@ -32,21 +30,9 @@ sub pick
-     return 'PkgConfig::LibPkgConf';
-   }
-   
--  if(Alien::Build::Plugin::PkgConfig::CommandLine->available)
--  {
--    unless(_perl_config('osname') eq 'solaris' && _perl_config('ptrsize') == 8)
--    {
--      return 'PkgConfig::CommandLine';
--    }
--  }
--  
--  if(Alien::Build::Plugin::PkgConfig::PP->available)
--  {
--    return 'PkgConfig::PP';
--  }
-   else
-   {
--    Carp::carp("Could not find an appropriate pkg-config implementation, please install PkgConfig.pm, PkgConfig::LibPkgConf, pkg-config or pkgconf");
-+    Carp::carp("Could not find an appropriate pkg-config implementation, please install PkgConfig::LibPkgConf");
-   }
- }
- 
-diff --git a/t/01_use.t b/t/01_use.t
-index 08dc563..344d242 100644
---- a/t/01_use.t
-+++ b/t/01_use.t
-@@ -37,11 +37,9 @@ require_ok 'Alien::Build::Plugin::Fetch::Local';
- require_ok 'Alien::Build::Plugin::Fetch::LocalDir';
- require_ok 'Alien::Build::Plugin::Fetch::NetFTP';
- require_ok 'Alien::Build::Plugin::Gather::IsolateDynamic';
--require_ok 'Alien::Build::Plugin::PkgConfig::CommandLine';
- require_ok 'Alien::Build::Plugin::PkgConfig::LibPkgConf';
- require_ok 'Alien::Build::Plugin::PkgConfig::MakeStatic';
- require_ok 'Alien::Build::Plugin::PkgConfig::Negotiate';
--require_ok 'Alien::Build::Plugin::PkgConfig::PP';
- require_ok 'Alien::Build::Plugin::Prefer::BadVersion';
- require_ok 'Alien::Build::Plugin::Prefer::SortVersions';
- require_ok 'Alien::Build::Plugin::Probe::CBuilder';
-@@ -91,11 +89,9 @@ ok(-f 't/alien_build_plugin_fetch_local.t', 'test for Alien::Build::Plugin::Fetc
- ok(-f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::Build::Plugin::Fetch::LocalDir');
- ok(-f 't/alien_build_plugin_fetch_netftp.t', 'test for Alien::Build::Plugin::Fetch::NetFTP');
- ok(-f 't/alien_build_plugin_gather_isolatedynamic.t', 'test for Alien::Build::Plugin::Gather::IsolateDynamic');
--ok(-f 't/alien_build_plugin_pkgconfig_commandline.t', 'test for Alien::Build::Plugin::PkgConfig::CommandLine');
- ok(-f 't/alien_build_plugin_pkgconfig_libpkgconf.t', 'test for Alien::Build::Plugin::PkgConfig::LibPkgConf');
- ok(-f 't/alien_build_plugin_pkgconfig_makestatic.t', 'test for Alien::Build::Plugin::PkgConfig::MakeStatic');
- ok(-f 't/alien_build_plugin_pkgconfig_negotiate.t', 'test for Alien::Build::Plugin::PkgConfig::Negotiate');
--ok(-f 't/alien_build_plugin_pkgconfig_pp.t', 'test for Alien::Build::Plugin::PkgConfig::PP');
- ok(-f 't/alien_build_plugin_prefer_badversion.t', 'test for Alien::Build::Plugin::Prefer::BadVersion');
- ok(-f 't/alien_build_plugin_prefer_sortversions.t', 'test for Alien::Build::Plugin::Prefer::SortVersions');
- ok(-f 't/alien_build_plugin_probe_cbuilder.t', 'test for Alien::Build::Plugin::Probe::CBuilder');
-diff --git a/t/alien_build_plugin_pkgconfig_negotiate.t b/t/alien_build_plugin_pkgconfig_negotiate.t
-index 2241348..30a5451 100644
---- a/t/alien_build_plugin_pkgconfig_negotiate.t
-+++ b/t/alien_build_plugin_pkgconfig_negotiate.t
-@@ -16,7 +16,7 @@ subtest 'pick' => sub {
- 
- subtest 'override' => sub {
- 
--  foreach my $name (qw( CommandLine LibPkgConf PP ))
-+  foreach my $name (qw( LibPkgConf ))
-   {
-     local $ENV{ALIEN_BUILD_PKG_CONFIG} = "PkgConfig::$name";
-     subtest $ENV{ALIEN_BUILD_PKG_CONFIG} => sub {
-diff --git a/t/alien_build_plugin_pkgconfig_negotiate__pick.t b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
-index b0797ca..6b4decc 100644
---- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t
-+++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
-@@ -55,131 +55,6 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new(
-   ],
- );
- 
--subtest 'CommandLine' => sub {
--
--  local $INC{'PkgConfig.pm'} = __FILE__;
--  local $PkgConfig::VERSION = '0.14026';
--
--  my %which;
--
--  require File::Which;
--  
--  my $mock = Test2::Mock->new(
--    class => 'File::Which',
--    override => [
--      which => sub {
--        my($prog) = @_;
--        if(defined $prog)
--        {
--          if($which{$prog})
--          {
--            note "which: $prog => $which{$prog}";
--            return $which{$prog};
--          }
--          else
--          {
--            note "which: $prog N/A";
--          }
--        }
--        else
--        {
--          note "which: undef";
--        }
--      },
--    ],
--  );
--  
--  subtest 'no command line' => sub {
--
--    %which = ();
--
--    is(
--      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--      'PkgConfig::PP',
--    );
--  
--  };
--
--  subtest 'pkg-config' => sub {
--  
--    %which = ( 'pkg-config' => '/usr/bin/pkg-config' );
--  
--    is(
--      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--      'PkgConfig::CommandLine',
--    );
--
--  };
--
--  subtest 'pkgconf' => sub {
--  
--    %which = ( 'pkgconf' => '/usr/bin/pkgconf' );
--  
--    is(
--      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--      'PkgConfig::CommandLine',
--    );
--
--  };
--
--  subtest 'PKG_CONFIG' => sub {
--  
--    local $ENV{PKG_CONFIG} = 'foo-pkg-config';
--    %which = ( 'foo-pkg-config' => '/usr/bin/foo-pkg-config' );
--    
--    is(
--      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--      'PkgConfig::CommandLine',
--    );    
--  
--  };
--
--  subtest 'PP' => sub {
--
--    subtest '64 bit solaris' => sub {
--  
--      %which = ( 'pkg-config' => '/usr/bin/pkg-config' );
--
--      # From the old AB::MB days we prefer PkgConfig.pm
--      # for 64 bit solaris over the command line pkg-config
--      local $^O = 'solaris';
--      
--      my $mock2 = Test2::Mock->new(
--        class => 'Alien::Build::Plugin::PkgConfig::Negotiate',
--        override => [
--          _perl_config => sub {
--            my($key) = @_;
--            if($key eq 'ptrsize')
--            { return 8 }
--            elsif($key eq 'osname')
--            { return 'solaris' }
--            else
--            { return $Config{$key} }
--          },
--        ],
--      );
--      
--      is(
--        Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--        'PkgConfig::PP',
--      );
--
--    };
--    
--    subtest 'PP is fallback' => sub {
--
--      %which = ();
--
--      is(
--        Alien::Build::Plugin::PkgConfig::Negotiate->pick,
--        'PkgConfig::PP',
--      );
--
--    };
--
--  };
--
--};
- 
- done_testing;
- 
--- 
-2.13.5
-
diff --git a/Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch b/Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch
new file mode 100644
index 0000000..d1f1d56
--- /dev/null
+++ b/Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch
@@ -0,0 +1,324 @@
+From c00c30fb159f4a90a57191ffbcfe665923ee1455 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 8 Sep 2017 11:31:02 +0200
+Subject: [PATCH] Remove redundant pkgconfig implementations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only one implementation is required, we selected
+Alien::Build::Plugin::PkgConfig::LibPkgConf. This patch removes other
+ones to decrease number of dependencies.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ MANIFEST                                         |   4 -
+ Makefile.PL                                      |   4 +-
+ lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm    |  16 +--
+ t/01_use.t                                       |   4 -
+ t/alien_build_plugin_pkgconfig_negotiate.t       |   2 +-
+ t/alien_build_plugin_pkgconfig_negotiate__pick.t | 139 ++---------------------
+ 6 files changed, 11 insertions(+), 158 deletions(-)
+
+diff --git a/MANIFEST b/MANIFEST
+index 655a1a2..e6d3798 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -144,11 +144,9 @@ lib/Alien/Build/Plugin/Fetch/Local.pm
+ lib/Alien/Build/Plugin/Fetch/LocalDir.pm
+ lib/Alien/Build/Plugin/Fetch/NetFTP.pm
+ lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm
+-lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm
+ lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm
+ lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm
+ lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
+-lib/Alien/Build/Plugin/PkgConfig/PP.pm
+ lib/Alien/Build/Plugin/Prefer.pod
+ lib/Alien/Build/Plugin/Prefer/BadVersion.pm
+ lib/Alien/Build/Plugin/Prefer/SortVersions.pm
+@@ -213,12 +211,10 @@ t/alien_build_plugin_fetch_lwp.t
+ t/alien_build_plugin_fetch_netftp.t
+ t/alien_build_plugin_gather_isolatedynamic.t
+ t/alien_build_plugin_meta.t
+-t/alien_build_plugin_pkgconfig_commandline.t
+ t/alien_build_plugin_pkgconfig_libpkgconf.t
+ t/alien_build_plugin_pkgconfig_makestatic.t
+ t/alien_build_plugin_pkgconfig_negotiate.t
+ t/alien_build_plugin_pkgconfig_negotiate__pick.t
+-t/alien_build_plugin_pkgconfig_pp.t
+ t/alien_build_plugin_prefer_badversion.t
+ t/alien_build_plugin_prefer_sortversions.t
+ t/alien_build_plugin_probe_cbuilder.t
+diff --git a/Makefile.PL b/Makefile.PL
+index 253cfdd..039543d 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -71,11 +71,9 @@ my %WriteMakefileArgs = (
+     "lib/Alien/Build/Plugin/Fetch/LocalDir.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/LocalDir.pm",
+     "lib/Alien/Build/Plugin/Fetch/NetFTP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/NetFTP.pm",
+     "lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Gather/IsolateDynamic.pm",
+-    "lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/CommandLine.pm",
+     "lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm",
+     "lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/MakeStatic.pm",
+     "lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/Negotiate.pm",
+-    "lib/Alien/Build/Plugin/PkgConfig/PP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/PP.pm",
+     "lib/Alien/Build/Plugin/Prefer.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer.pod",
+     "lib/Alien/Build/Plugin/Prefer/BadVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/BadVersion.pm",
+     "lib/Alien/Build/Plugin/Prefer/SortVersions.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/SortVersions.pm",
+@@ -181,4 +179,4 @@ sub requires { goto &runtime_requires }
+ sub runtime_requires {
+   my ($module, $version_or_range) = @_;
+   _add_prereq(PREREQ_PM => $module, $version_or_range);
+-}
+\ No newline at end of file
++}
+diff --git a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
+index d8f3af2..ba6d875 100644
+--- a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
++++ b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
+@@ -3,9 +3,7 @@ package Alien::Build::Plugin::PkgConfig::Negotiate;
+ use strict;
+ use warnings;
+ use Alien::Build::Plugin;
+-use Alien::Build::Plugin::PkgConfig::CommandLine;
+ use Alien::Build::Plugin::PkgConfig::LibPkgConf;
+-use Alien::Build::Plugin::PkgConfig::PP;
+ use Alien::Build::Util qw( _perl_config );
+ use Carp ();
+ 
+@@ -32,18 +30,6 @@ sub pick
+     return 'PkgConfig::LibPkgConf';
+   }
+   
+-  if(Alien::Build::Plugin::PkgConfig::CommandLine->available)
+-  {
+-    unless(_perl_config('osname') eq 'solaris' && _perl_config('ptrsize') == 8)
+-    {
+-      return 'PkgConfig::CommandLine';
+-    }
+-  }
+-  
+-  if(Alien::Build::Plugin::PkgConfig::PP->available)
+-  {
+-    return 'PkgConfig::PP';
+-  }
+   else
+   {
+     # this is a fata error.  because we check for a pkg-config implementation
+@@ -51,7 +37,7 @@ sub pick
+     # fallback on installing PkgConfig.pm as a prereq if nothing else is avail).
+     # we therefore expect at least one of these to work, if not, then the configuration
+     # of the system has shifted from underneath us.
+-    Carp::croak("Could not find an appropriate pkg-config implementation, please install PkgConfig.pm, PkgConfig::LibPkgConf, pkg-config or pkgconf");
++    Carp::croak("Could not find an appropriate pkg-config implementation, please install PkgConfig::LibPkgConf");
+   }
+ }
+ 
+diff --git a/t/01_use.t b/t/01_use.t
+index a2dc604..c52e3ce 100644
+--- a/t/01_use.t
++++ b/t/01_use.t
+@@ -37,11 +37,9 @@ require_ok 'Alien::Build::Plugin::Fetch::Local';
+ require_ok 'Alien::Build::Plugin::Fetch::LocalDir';
+ require_ok 'Alien::Build::Plugin::Fetch::NetFTP';
+ require_ok 'Alien::Build::Plugin::Gather::IsolateDynamic';
+-require_ok 'Alien::Build::Plugin::PkgConfig::CommandLine';
+ require_ok 'Alien::Build::Plugin::PkgConfig::LibPkgConf';
+ require_ok 'Alien::Build::Plugin::PkgConfig::MakeStatic';
+ require_ok 'Alien::Build::Plugin::PkgConfig::Negotiate';
+-require_ok 'Alien::Build::Plugin::PkgConfig::PP';
+ require_ok 'Alien::Build::Plugin::Prefer::BadVersion';
+ require_ok 'Alien::Build::Plugin::Prefer::SortVersions';
+ require_ok 'Alien::Build::Plugin::Probe::CBuilder';
+@@ -90,11 +88,9 @@ ok(-f 't/alien_build_plugin_fetch_local.t', 'test for Alien::Build::Plugin::Fetc
+ ok(-f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::Build::Plugin::Fetch::LocalDir');
+ ok(-f 't/alien_build_plugin_fetch_netftp.t', 'test for Alien::Build::Plugin::Fetch::NetFTP');
+ ok(-f 't/alien_build_plugin_gather_isolatedynamic.t', 'test for Alien::Build::Plugin::Gather::IsolateDynamic');
+-ok(-f 't/alien_build_plugin_pkgconfig_commandline.t', 'test for Alien::Build::Plugin::PkgConfig::CommandLine');
+ ok(-f 't/alien_build_plugin_pkgconfig_libpkgconf.t', 'test for Alien::Build::Plugin::PkgConfig::LibPkgConf');
+ ok(-f 't/alien_build_plugin_pkgconfig_makestatic.t', 'test for Alien::Build::Plugin::PkgConfig::MakeStatic');
+ ok(-f 't/alien_build_plugin_pkgconfig_negotiate.t', 'test for Alien::Build::Plugin::PkgConfig::Negotiate');
+-ok(-f 't/alien_build_plugin_pkgconfig_pp.t', 'test for Alien::Build::Plugin::PkgConfig::PP');
+ ok(-f 't/alien_build_plugin_prefer_badversion.t', 'test for Alien::Build::Plugin::Prefer::BadVersion');
+ ok(-f 't/alien_build_plugin_prefer_sortversions.t', 'test for Alien::Build::Plugin::Prefer::SortVersions');
+ ok(-f 't/alien_build_plugin_probe_cbuilder.t', 'test for Alien::Build::Plugin::Probe::CBuilder');
+diff --git a/t/alien_build_plugin_pkgconfig_negotiate.t b/t/alien_build_plugin_pkgconfig_negotiate.t
+index 95e0d84..9492ea1 100644
+--- a/t/alien_build_plugin_pkgconfig_negotiate.t
++++ b/t/alien_build_plugin_pkgconfig_negotiate.t
+@@ -16,7 +16,7 @@ subtest 'pick' => sub {
+ 
+ subtest 'override' => sub {
+ 
+-  foreach my $name (qw( CommandLine LibPkgConf PP ))
++  foreach my $name (qw( LibPkgConf ))
+   {
+     local $ENV{ALIEN_BUILD_PKG_CONFIG} = "PkgConfig::$name";
+     subtest $ENV{ALIEN_BUILD_PKG_CONFIG} => sub {
+diff --git a/t/alien_build_plugin_pkgconfig_negotiate__pick.t b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
+index b0797ca..e68ff05 100644
+--- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t
++++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
+@@ -24,9 +24,10 @@ subtest 'LibPkgConf' => sub {
+   
+       local $PkgConfig::LibPkgConf::VERSION = '0.01';
+ 
+-      isnt(
+-        Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-        'PkgConfig::LibPkgConf',
++      eval { Alien::Build::Plugin::PkgConfig::Negotiate->pick };
++      ok(
++        $@,
++        'PkgConfig::LibPkgConf "0.1" is too old',
+       );
+ 
+     };
+@@ -39,9 +40,10 @@ subtest 'LibPkgConf' => sub {
+     # cannot be loaded for the rest of this .t file
+     note scalar capture_merged { Devel::Hide->import(qw( PkgConfig::LibPkgConf )) };
+   
+-    isnt(
+-      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-      'PkgConfig::LibPkgConf',
++    eval { Alien::Build::Plugin::PkgConfig::Negotiate->pick };
++    ok(
++      $@,
++      'Missing PkgConfig::LibPkgConf triggers an exception',
+     );
+ 
+   };
+@@ -55,131 +57,6 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new(
+   ],
+ );
+ 
+-subtest 'CommandLine' => sub {
+-
+-  local $INC{'PkgConfig.pm'} = __FILE__;
+-  local $PkgConfig::VERSION = '0.14026';
+-
+-  my %which;
+-
+-  require File::Which;
+-  
+-  my $mock = Test2::Mock->new(
+-    class => 'File::Which',
+-    override => [
+-      which => sub {
+-        my($prog) = @_;
+-        if(defined $prog)
+-        {
+-          if($which{$prog})
+-          {
+-            note "which: $prog => $which{$prog}";
+-            return $which{$prog};
+-          }
+-          else
+-          {
+-            note "which: $prog N/A";
+-          }
+-        }
+-        else
+-        {
+-          note "which: undef";
+-        }
+-      },
+-    ],
+-  );
+-  
+-  subtest 'no command line' => sub {
+-
+-    %which = ();
+-
+-    is(
+-      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-      'PkgConfig::PP',
+-    );
+-  
+-  };
+-
+-  subtest 'pkg-config' => sub {
+-  
+-    %which = ( 'pkg-config' => '/usr/bin/pkg-config' );
+-  
+-    is(
+-      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-      'PkgConfig::CommandLine',
+-    );
+-
+-  };
+-
+-  subtest 'pkgconf' => sub {
+-  
+-    %which = ( 'pkgconf' => '/usr/bin/pkgconf' );
+-  
+-    is(
+-      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-      'PkgConfig::CommandLine',
+-    );
+-
+-  };
+-
+-  subtest 'PKG_CONFIG' => sub {
+-  
+-    local $ENV{PKG_CONFIG} = 'foo-pkg-config';
+-    %which = ( 'foo-pkg-config' => '/usr/bin/foo-pkg-config' );
+-    
+-    is(
+-      Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-      'PkgConfig::CommandLine',
+-    );    
+-  
+-  };
+-
+-  subtest 'PP' => sub {
+-
+-    subtest '64 bit solaris' => sub {
+-  
+-      %which = ( 'pkg-config' => '/usr/bin/pkg-config' );
+-
+-      # From the old AB::MB days we prefer PkgConfig.pm
+-      # for 64 bit solaris over the command line pkg-config
+-      local $^O = 'solaris';
+-      
+-      my $mock2 = Test2::Mock->new(
+-        class => 'Alien::Build::Plugin::PkgConfig::Negotiate',
+-        override => [
+-          _perl_config => sub {
+-            my($key) = @_;
+-            if($key eq 'ptrsize')
+-            { return 8 }
+-            elsif($key eq 'osname')
+-            { return 'solaris' }
+-            else
+-            { return $Config{$key} }
+-          },
+-        ],
+-      );
+-      
+-      is(
+-        Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-        'PkgConfig::PP',
+-      );
+-
+-    };
+-    
+-    subtest 'PP is fallback' => sub {
+-
+-      %which = ();
+-
+-      is(
+-        Alien::Build::Plugin::PkgConfig::Negotiate->pick,
+-        'PkgConfig::PP',
+-      );
+-
+-    };
+-
+-  };
+-
+-};
+ 
+ done_testing;
+ 
+-- 
+2.13.5
+
diff --git a/perl-Alien-Build.spec b/perl-Alien-Build.spec
index ad4f3c5..437ed9c 100644
--- a/perl-Alien-Build.spec
+++ b/perl-Alien-Build.spec
@@ -2,7 +2,7 @@
 %{bcond_without perl_Alien_Build_enables_optional_test}
 
 Name:           perl-Alien-Build
-Version:        1.16
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Build external dependencies for use in CPAN
 License:        GPL+ or Artistic
@@ -10,7 +10,7 @@ URL:            http://search.cpan.org/dist/Alien-Build/
 Source0:        http://www.cpan.org/authors/id/P/PL/PLICEASE/Alien-Build-%{version}.tar.gz
 # Support only the most advanced pkgconfig implementation,
 # the files are deleted in prep section
-Patch0:         Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch
+Patch0:         Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch
 BuildArch:      noarch
 BuildRequires:  make
 BuildRequires:  perl-generators
@@ -87,7 +87,7 @@ BuildRequires:  perl(Test2::V0) >= 0.000060
 # Optional tests:
 %if !%{defined perl_bootstrap}
 # Break build cycle: Acme::Alien::DontPanic → Test::Alien
-BuildRequires:  perl(Acme::Alien::DontPanic)
+BuildRequires:  perl(Acme::Alien::DontPanic) >= 0.026
 %endif
 BuildRequires:  perl(Alien::Base::ModuleBuild) >= 0.040
 BuildRequires:  perl(Alien::Base::PkgConfig) >= 0.040
@@ -173,6 +173,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 26 2017 Petr Pisar <ppisar@redhat.com> - 1.18-1
+- 1.18 bump
+
 * Tue Sep 19 2017 Petr Pisar <ppisar@redhat.com> - 1.16-1
 - 1.16 bump
 
diff --git a/sources b/sources
index c4fbb8a..c98d770 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Alien-Build-1.16.tar.gz) = 3c914daa80eaca10532f26cfdcc014899739e1d8d19ba81473063648b4a04edae4f14f57a9aec53d9575719069a81db3d652638d971b034d2bc869deef0f037f
+SHA512 (Alien-Build-1.18.tar.gz) = 06f25c156167d3d15a5b51daf694c67d6a7b164ceebedb81a3ee7b2ea4a81649b2a58ede3bb46f867862c7e37b0f30d0e37bf43d5f1f68231dc938d58ce55628