diff --git a/modules/osx/functions/_manb_manp b/modules/osx/functions/_manb_manp
new file mode 100644
index 0000000..bbba2af
--- /dev/null
+++ b/modules/osx/functions/_manb_manp
@@ -0,0 +1,12 @@
+#compdef manb manp
+#autoload
+
+#
+# Completes manb and manp.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+_man
+
diff --git a/modules/osx/functions/manb b/modules/osx/functions/manb
index 1268012..aac5fb5 100644
--- a/modules/osx/functions/manb
+++ b/modules/osx/functions/manb
@@ -19,6 +19,6 @@ function manb {
     print 'What manual page do you want?' >&2
   fi
 }
-compdef _man manb
+
 manb "$@"
 
diff --git a/modules/osx/functions/manp b/modules/osx/functions/manp
index b2f6758..7ecb1da 100644
--- a/modules/osx/functions/manp
+++ b/modules/osx/functions/manp
@@ -15,6 +15,6 @@ function manp {
     print 'What manual page do you want?' >&2
   fi
 }
-compdef _man manp
+
 manp "$@"
 
diff --git a/modules/utility/functions/_dut b/modules/utility/functions/_dut
new file mode 100644
index 0000000..9791f30
--- /dev/null
+++ b/modules/utility/functions/_dut
@@ -0,0 +1,12 @@
+#compdef dut
+#autoload
+
+#
+# Completes dut.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+_du
+
diff --git a/modules/utility/functions/dut b/modules/utility/functions/dut
index f07511b..e33f6d7 100644
--- a/modules/utility/functions/dut
+++ b/modules/utility/functions/dut
@@ -23,7 +23,6 @@ function dut {
     done < <(du -kcs "$@") | sort -n -r
   fi
 }
-compdef _du dut
 
 dut "$@"