diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index ab094d63..0b882393 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1917,9 +1917,23 @@ M:
   - .m
   tm_scope: source.lisp
   ace_mode: lisp
-  
+
 M4:
   type: programming
+  aliases:
+  - autoconf
+  extensions:
+  - .m4
+  filenames:
+  - configure.ac
+  tm_scope: none
+  ace_mode: text
+
+M4Sugar:
+  type: programming
+  group: M4
+  aliases:
+  - autoconf
   extensions:
   - .m4
   filenames:
diff --git a/samples/M4/ax_ruby_devel.m4 b/samples/M4Sugar/ax_ruby_devel.m4
similarity index 100%
rename from samples/M4/ax_ruby_devel.m4
rename to samples/M4Sugar/ax_ruby_devel.m4
diff --git a/samples/M4/configure.ac b/samples/M4Sugar/filenames/configure.ac
similarity index 100%
rename from samples/M4/configure.ac
rename to samples/M4Sugar/filenames/configure.ac
diff --git a/samples/M4/list.m4 b/samples/M4Sugar/list.m4
similarity index 100%
rename from samples/M4/list.m4
rename to samples/M4Sugar/list.m4