diff --git a/.editorconfig b/.editorconfig
index 708188ad8..bd981d12d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,5 +14,8 @@ tab_width = 8
 [*.{py,sh}]
 indent_style = tab
 
+[{Makefile.am,Makefile.sources,configure.ac}]
+tab_width = 8
+
 [{CMakeLists.txt,*.cmake}]
 indent_size = 2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da6ae8b39..55366c063 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -539,11 +539,11 @@ target_link_libraries(harfbuzz-subset harfbuzz ${THIRD_PARTY_LIBS})
 
 if (UNIX OR MINGW)
   # Make symbols link locally
-  include(CheckCXXCompilerFlag)
+  include (CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-Bsymbolic-functions CXX_SUPPORTS_FLAG_BSYMB_FUNCS)
-  if(CXX_SUPPORTS_FLAG_BSYMB_FUNCS)
+  if (CXX_SUPPORTS_FLAG_BSYMB_FUNCS)
     link_libraries(-Bsymbolic-functions)
-  endif()
+  endif ()
 
   if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Make sure we don't link to libstdc++
diff --git a/configure.ac b/configure.ac
index 9e3bf0817..aca03bfaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -539,8 +539,8 @@ Additional shapers (the more the merrier):
 
 Platform shapers (not normally needed):
 	CoreText:		${have_coretext}
-	Uniscribe:		${have_uniscribe}
 	DirectWrite:		${have_directwrite}
+	Uniscribe:		${have_uniscribe}
 
 Other features:
 	Documentation:		${enable_gtk_doc}