diff --git a/Makefile.PL b/Makefile.PL
index b820a48f..008e7766 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,21 +12,17 @@ MAKE_GOTOOLS
 WriteMakefile(
     NAME      => 'Percona::Toolkit',
     VERSION   => '3.7.0-2',
-    EXE_FILES => [
-      map {
-         (my $name = $_) =~ s/^bin.//;
-         my $file_name = $_;
-         if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) || ( $file_name !~ m/pt-stalk/ )  || ( $file_name !~ m/pt-k8s/ )  ) {
-	     $_;
-         }
-      } <bin/*>
-    ],
+    EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
       map {
          (my $name = $_) =~ s/^bin.//;
          my $file_name = $_;
-         if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) || ( $file_name !~ m/pt-stalk/ )  || ( $file_name !~ m/pt-k8s/ )  ) {
+         if ( ( $file_name =~ m/mongo/ ) || ( $file_name =~ m/pg/ ) || ( $file_name =~ m/galera/ )  || ( $file_name =~ m/k8s/ ) || ( $file_name =~ m/secure/ ) ) {
+            # We have to put empty line here to avoid the MAN1PODS hash corruption
+            '' => '',
+         }
+         else {
              $_ => "blib/man1/$name.1p";
          }
       } <bin/*>
@@ -37,4 +33,4 @@ WriteMakefile(
         DBI           => 1.46,
         DBD::mysql    => 3.0000_0,
     },
-);
\ No newline at end of file
+);