diff --git a/ChangeLog b/ChangeLog
index 85da0efbd..cfe980902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-09  Oliver Kiddle  <opk@zsh.org>
 
+	* 33640: clutton: Completion/BSD/Command/_kld: look in
+	/boot/modules instead of /modules for third-party modules
+
 	* 33643: Doc/Zsh/options.yo: elaborate documentation of
 	the PRIVILEGED option
 
diff --git a/Completion/BSD/Command/_kld b/Completion/BSD/Command/_kld
index b967f33c4..34f26f1e9 100644
--- a/Completion/BSD/Command/_kld
+++ b/Completion/BSD/Command/_kld
@@ -4,7 +4,7 @@
 _kld_module() {
   local ret=1
 
-  compadd "$@" - /boot/kernel/*.ko(-.:t) /modules/*.ko(-.:t) && ret=0
+  compadd "$@" - /boot/{kernel,modules}/*.ko(-.:t) && ret=0
   _files "$@" -g '*.ko(-.)' && ret=0
 
   return ret