diff --git a/config/fish/functions/bmake.fish b/config/fish/functions/bmake.fish
deleted file mode 100644
index 46a103c..0000000
--- a/config/fish/functions/bmake.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-# pkgsrc does not like MAKEFLAGS being set
-function bmake
-	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
-		env MAKEFLAGS= bmake $argv
-	else
-		command bmake $argv
-	end
-end
diff --git a/config/fish/functions/make.fish b/config/fish/functions/make.fish
new file mode 100644
index 0000000..f04e163
--- /dev/null
+++ b/config/fish/functions/make.fish
@@ -0,0 +1,9 @@
+# Automatically use bmake instead of make when using pkgsrc
+function make
+	if which bmake >/dev/null && string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
+		# pkgsrc does not like MAKEFLAGS including -j
+		env MAKEFLAGS= bmake $argv
+	else
+		command make $argv
+	end
+end