diff --git a/bootstrap b/bootstrap
index a067fda0..07166066 100755
--- a/bootstrap
+++ b/bootstrap
@@ -33,6 +33,10 @@ set -x
 
 touch ChangeLog
 
+# Older versions of aclocal refused to work without `m4` folder:
+# https://lists.gnu.org/archive/html/automake-patches/2010-02/msg00030.html
+mkdir -p m4
+
 autoreconf -i
 
 #----------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index b19992cf..35bc2ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1144,7 +1144,6 @@ AC_CONFIG_FILES([
         include/Makefile
         lib/Makefile
         lib/libethercat.pc
-        m4/Makefile
         master/Kbuild
         master/Makefile
         script/Makefile
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index aba9c45a..00000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#------------------------------------------------------------------------------
-#
-#  $Id$
-#
-#  Copyright (C) 2006-2008  Florian Pose, Ingenieurgemeinschaft IgH
-#
-#  This file is part of the IgH EtherCAT Master.
-#
-#  The IgH EtherCAT Master is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
-#
-#  The IgH EtherCAT Master is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-#  Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along
-#  with the IgH EtherCAT Master; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#  ---
-#
-#  The license mentioned above concerns the source code only. Using the
-#  EtherCAT technology and brand is only permitted in compliance with the
-#  industrial property and similar rights of Beckhoff Automation GmbH.
-#
-#------------------------------------------------------------------------------
-
-
-
-#------------------------------------------------------------------------------