diff --git a/ChangeLog b/ChangeLog
index 353f88fedb..1f9f17c68f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan  3 12:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* acinclude.m4: rename aclocal.m4, which should be generated by
+	  aclocal.  [ruby-core:72675] [Bug #11941]
+
 Sat Jan  2 21:07:55 2016  Eric Wong  <e@80x24.org>
 
 	* thread_sync.c (queue_do_pop): avoid cast with Qfalse
diff --git a/Makefile.in b/Makefile.in
index f641ea1d77..e1c6a1cc12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,6 +22,7 @@ LD = @LD@
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
+ACLOCAL = aclocal
 CONFIGURE = @CONFIGURE@
 @SET_MAKE@
 MKFILES = @MAKEFILES@
@@ -305,6 +306,9 @@ reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
 $(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
 	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+	$(CHDIR) $(srcdir) && exec $(ACLOCAL)
+
 incs: id.h
 all-incs: probes.h
 
diff --git a/aclocal.m4 b/acinclude.m4
similarity index 97%
rename from aclocal.m4
rename to acinclude.m4
index 30fccd52fe..99b24e6d93 100644
--- a/aclocal.m4
+++ b/acinclude.m4
@@ -4,7 +4,7 @@ AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
     msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
     AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
 	msg_begin="`tput smso 2>/dev/null`"
-    	AS_CASE(["$msg_begin"], ['@<:@'*m],
+	AS_CASE(["$msg_begin"], ['@<:@'*m],
 	    [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
 	    msg_checking="${msg_begin}33m"
 	    AS_IF([test ${TEST_COLORS:+set}], [
diff --git a/common.mk b/common.mk
index 842a1c4ba9..79e9c224b9 100644
--- a/common.mk
+++ b/common.mk
@@ -520,7 +520,7 @@ realclean-local:: distclean-local
 	$(Q)$(RM) id.c id.h probes.dmyh
 	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h
 	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem
+	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
 	$(Q)$(RM) $(GOLFPRELUDES)