diff --git a/Command/Lock.hs b/Command/Lock.hs
index e21792143a..e55cd9e79a 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -19,7 +19,7 @@ command :: [Command]
 command = [repoCommand "lock" paramPath seek "undo unlock command"]
 
 seek :: [CommandSeek]
-seek = [withFilesUnlocked start]
+seek = [withFilesUnlocked start, withFilesUnlockedToBeCommitted start]
 
 {- Undo unlock -}
 start :: CommandStartBackendFile
diff --git a/debian/changelog b/debian/changelog
index 783496614f..393a6161bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ git-annex (0.20110523) UNRELEASED; urgency=low
   * Massively sped up `git annex lock` by avoiding use of the uber-slow
     `git reset`, and only running `git checkout` once, even when many files
     are being locked.
+  * Fix locking of files with staged changes.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 28 May 2011 22:29:37 -0400