diff --git a/init/tcsh_completion.in b/init/tcsh_completion.in
index 348e02de..8c88ebf3 100644
--- a/init/tcsh_completion.in
+++ b/init/tcsh_completion.in
@@ -107,3 +107,7 @@ complete module 'C,/*,f,' 'C,.*,f,' 'C,~/*,f,' \
         'C/sw*/(switch)/' \
         "p/1/(@comp_cmds@ @comp_opts@)/" \
         "n/-*/(@comp_cmds@)/"
+
+complete ml 'c/-/`_module_loaded`/' \
+            'p/1-/`_module_not_yet_loaded`//'
+