diff --git a/Makefile b/Makefile
index 0712a93..891dd26 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ HELPER_SHELL+=bee-cache-update
 LIBRARY_SHELL+=beelib.config.sh
 
 BUILDTYPES+=autogen
+BUILDTYPES+=autotools
 BUILDTYPES+=cmake
-BUILDTYPES+=configure
 BUILDTYPES+=jb
 BUILDTYPES+=make
 BUILDTYPES+=perl-module
diff --git a/buildtypes/configure.sh.in b/buildtypes/autotools.sh.in
similarity index 91%
rename from buildtypes/configure.sh.in
rename to buildtypes/autotools.sh.in
index b66043b..12af205 100644
--- a/buildtypes/configure.sh.in
+++ b/buildtypes/autotools.sh.in
@@ -22,6 +22,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+#### detect autotools build type ##############################################
+
 if [ ! -x "${S}/configure" ] ; then
     return
 fi
@@ -32,6 +34,8 @@ if ! egrep -qi "generated by.*autoconf" "${S}/configure" ; then
     return
 fi
 
+#### set autotools build type #################################################
+
 BEE_BUILDTYPE=configure
 
 #### bee_configure() ##########################################################
@@ -52,6 +56,8 @@ bee_install() {
     start_cmd make ${BEE_MAKEFLAGS} install DESTDIR=${D} "$@"
 }
 
+#### setup autotools build type ###############################################
+
 if ! grep -q datarootdir ${S}/configure ; then
     BEE_CONFIGURE='compat'
 fi
diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index a348e4a..13fc1bb 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -895,7 +895,7 @@ bee_run patch ${bee_PATCHFILES[@]}
 
 bee_buildmagic=$(${BEE_BINDIR}/beeuniq ${BEE_BUILDTYPE[@]} \
                                cmake \
-                               configure \
+                               autotools \
                                autogen \
                                perl-module \
                                perl-module-makemaker \