diff --git a/.editorconfig b/.editorconfig
index 107794e98..07102881c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 100
 
-[{Makefile,*.in}]
+[{Makefile,{BSD,GNU}makefile,*.in}]
 indent_style = tab
 
 [*.{md,rst}]
diff --git a/GNUmakefile b/GNUmakefile
index 1b69ab8d3..0748326c1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -7,7 +7,7 @@
 CMAKE ?= cmake
 
 GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
-			 echo 'Unix Makefiles')
+	echo 'Unix Makefiles')
 prefix ?= /usr/local
 PREFIX ?= $(prefix)
 
@@ -34,7 +34,7 @@ all: .begin build/fish
 .PHONY: .begin
 .begin:
 	@which $(CMAKE) > /dev/null 2> /dev/null || \
-		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
+		(echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
 
 .PHONY: build/fish
 build/fish: build/$(BUILDFILE)