diff --git a/ChangeLog b/ChangeLog
index 8f594b45b..77c1991f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-29  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* based on 31641, 31642: Completion/Unix/Command/_make: support
+	a couple of different variants of make.
+
 2013-08-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31672: Src/Modules/zpty.c, Test/V08zpty.ztst: add test that
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 0c5371dad..7b4c22466 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -1,4 +1,4 @@
-#compdef make gmake pmake dmake
+#compdef make gmake pmake dmake freebsd-make bmake
 
 # TODO: Based on targets given on the command line, show only variables that
 # are used in those targets and their dependencies.