diff --git a/CHANGES b/CHANGES
index b032d0d1..0f46f352 100644
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,7 @@ bash-completion (1.x)
   * Add xz and compress support and more tarball filename extensions to
     rpmbuild -t*/--tarbuild completion.
   * Don't hardcode path to lsmod.
+  * Fix sbcl file/dirname completion (Debian: #545743).
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/contrib/sbcl b/contrib/sbcl
index 9f722f7b..3dec851f 100644
--- a/contrib/sbcl
+++ b/contrib/sbcl
@@ -23,4 +23,4 @@ _sbcl()
 
     return 0
 } &&
-complete -F _sbcl $default sbcl sbcl-mt
+complete -F _sbcl $filenames sbcl sbcl-mt
diff --git a/test/lib/completions/sbcl-mt.exp b/test/lib/completions/sbcl-mt.exp
index 905a62ca..1188f197 100644
--- a/test/lib/completions/sbcl-mt.exp
+++ b/test/lib/completions/sbcl-mt.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "sbcl-mt "
+assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl-mt fixture1/"
 
 
 sync_after_int
diff --git a/test/lib/completions/sbcl.exp b/test/lib/completions/sbcl.exp
index 27633320..d5f2c8c2 100644
--- a/test/lib/completions/sbcl.exp
+++ b/test/lib/completions/sbcl.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "sbcl "
+assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl fixture1/"
 
 
 sync_after_int