diff --git a/autotools.sh b/autotools.sh
index 18204416fe..96bb235bad 100644
--- a/autotools.sh
+++ b/autotools.sh
@@ -1,11 +1,12 @@
 package: autotools
 version: "%(tag_basename)s"
-tag: v1.6.4
+tag: "v1.6.4"
 source: https://github.com/alisw/autotools
 prefer_system: "(?!slc5|slc6)"
 prefer_system_check: |
   export PATH=$PATH:$(brew --prefix gettext || true)/bin:$(brew --prefix texinfo || true)/bin;
-  which autoconf && which m4 && which automake && which makeinfo && which aclocal && which pkg-config && which autopoint && which libtool;
+  which autoconf && which m4 && which automake && which makeinfo && which \
+  aclocal && which pkg-config && which autopoint && which libtool;
   if [ $? -ne 0 ]; then printf "One or more autotools packages are missing on your system.\n * On a RHEL-compatible system you probably need: autoconf automake texinfo gettext gettext-devel libtool\n * On an Ubuntu-like system you probably need: autoconf automake autopoint texinfo gettext libtool libtool-bin pkg-config\n * On macOS you need: brew install autoconf automake gettext pkg-config"; exit 1; fi
 prepend_path:
   PKG_CONFIG_PATH: $(pkg-config --debug 2>&1 | grep 'Scanning directory' | sed -e "s/.*'\(.*\)'/\1/" | xargs echo | sed -e 's/ /:/g')
@@ -27,11 +28,11 @@ esac
 echo "Building ALICE autotools. To avoid this install autoconf, automake, autopoint, texinfo, pkg-config."
 
 # Restore original timestamps to avoid reconf (Git does not preserve them)
-pushd $SOURCEDIR
+pushd "$SOURCEDIR"
   ./missing-timestamps.sh --apply
 popd
 
-rsync -a --delete --exclude '**/.git' $SOURCEDIR/ .
+rsync -a --delete --exclude '**/.git' "$SOURCEDIR"/ .
 
 # Use our auto* tools as we build them
 export PATH=$INSTALLROOT/bin:$PATH
@@ -39,7 +40,7 @@ export LD_LIBRARY_PATH=$INSTALLROOT/lib:$LD_LIBRARY_PATH
 
 # help2man
 if pushd help2man*; then
-  ./configure --disable-dependency-tracking --prefix $INSTALLROOT
+  ./configure --disable-dependency-tracking --prefix "$INSTALLROOT"
   make ${JOBS+-j $JOBS}
   make install
   hash -r
@@ -55,7 +56,7 @@ pushd m4*
 ' doc/m4.texi
   rm -f doc/m4.texi.bak
   $USE_AUTORECONF && autoreconf -ivf
-  ./configure --disable-dependency-tracking --prefix $INSTALLROOT
+  ./configure --disable-dependency-tracking --prefix "$INSTALLROOT"
   make ${JOBS+-j $JOBS}
   make install
   hash -r
@@ -66,7 +67,7 @@ popd
 # with the latest version of autoconf / m4
 pushd autoconf*
   $USE_AUTORECONF && autoreconf -ivf
-  ./configure --prefix $INSTALLROOT
+  ./configure --prefix "$INSTALLROOT"
   make MAKEINFO=true ${JOBS+-j $JOBS}
   make MAKEINFO=true install
   hash -r
@@ -74,34 +75,16 @@ popd
 
 # libtool -- requires: m4
 pushd libtool*
-  ./configure --disable-dependency-tracking --prefix $INSTALLROOT --enable-ltdl-install
+  ./configure --disable-dependency-tracking --prefix "$INSTALLROOT" --enable-ltdl-install
   make ${JOBS+-j $JOBS}
   make install
   hash -r
 popd
 
-# Do not judge me. I am simply trying to float.
-# Apparently slc6 needs a different order compared
-# to the rest.
-case $ARCHITECTURE in
-  slc6*|ubuntu14*)
-    # automake -- requires: m4, autoconf, gettext
-    pushd automake*
-      $USE_AUTORECONF && [ -e bootstrap ] && sh ./bootstrap
-      ./configure --prefix $INSTALLROOT
-      make MAKEINFO=true ${JOBS+-j $JOBS}
-      make MAKEINFO=true install
-      hash -r
-    popd
-  ;;
-  *) ;;
-esac
-
-
 # gettext -- requires: nothing special
 pushd gettext*
   $USE_AUTORECONF && autoreconf -ivf
-  ./configure --prefix $INSTALLROOT \
+  ./configure --prefix "$INSTALLROOT" \
               --without-xz \
               --without-bzip2 \
               --disable-curses \
@@ -113,35 +96,19 @@ pushd gettext*
               --disable-acl \
               --disable-java \
               --disable-dependency-tracking \
-	      --without-emacs \
+              --without-emacs \
               --disable-silent-rules
   make ${JOBS+-j $JOBS}
   make install
   hash -r
 popd
 
-# Do not judge me. I am simply trying to float.
-case $ARCHITECTURE in
-  slc6*|ubuntu14*) ;;
-  *)
-    # automake -- requires: m4, autoconf, gettext
-    pushd automake*
-      $USE_AUTORECONF && [ -e bootstrap ] && sh ./bootstrap
-      ./configure --prefix $INSTALLROOT
-      make MAKEINFO=true ${JOBS+-j $JOBS}
-      make MAKEINFO=true install
-      hash -r
-    popd
-  ;;
-esac
-
-
 # pkgconfig -- requires: nothing special
 pushd pkg-config*
   OLD_LDFLAGS="$LDFLAGS"
   [[ ${ARCHITECTURE:0:3} == osx ]] && export LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Carbon"
   ./configure --disable-debug \
-              --prefix=$INSTALLROOT \
+              --prefix="$INSTALLROOT" \
               --disable-host-tool \
               --with-internal-glib
   export LDFLAGS="$OLD_LDFLAGS"
@@ -150,17 +117,13 @@ pushd pkg-config*
   hash -r
 popd
 
-# We need to detect OSX becase xargs behaves differently there
-XARGS_DO_NOT_FAIL='-r'
-[[ ${ARCHITECTURE:0:3} == osx ]] && XARGS_DO_NOT_FAIL=
-
 # Fix perl location, required on /usr/bin/perl
-grep -l -R -e '^#!.*perl' $INSTALLROOT | \
-  xargs ${XARGS_DO_NOT_FAIL} -n1 sed -ideleteme -e 's;^#!.*perl;#!/usr/bin/perl;'
-find $INSTALLROOT -name '*deleteme' -delete
-grep -l -R -e 'exec [^ ]*/perl' $INSTALLROOT | \
-  xargs ${XARGS_DO_NOT_FAIL} -n1 sed -ideleteme -e 's;exec [^ ]*/perl;exec /usr/bin/perl;g'
-find $INSTALLROOT -name '*deleteme' -delete
+grep -l -R -e '^#!.*perl' "$INSTALLROOT" | \
+  xargs -n1 sed -ideleteme -e 's;^#!.*perl;#!/usr/bin/perl;'
+find "$INSTALLROOT" -name '*deleteme' -delete
+grep -l -R -e 'exec [^ ]*/perl' "$INSTALLROOT" | \
+  xargs -n1 sed -ideleteme -e 's;exec [^ ]*/perl;exec /usr/bin/perl;g'
+find "$INSTALLROOT" -name '*deleteme' -delete
 
 # Pretend we have a modulefile to make the linter happy (don't delete)
-#%Module
+# alibuild-generate-module