diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 7a05cdfbae..496df1dd2e 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -19,7 +19,7 @@ import System.Environment
 
 def :: [Command]
 def = [noRepo checkAutoStart $ dontCheck repoExists $ withOptions options $
-	command "assistant" paramNothing seek SectionCommon
+	notBareRepo $ command "assistant" paramNothing seek SectionCommon
 		"automatically handle changes"]
 
 options :: [Option]
diff --git a/debian/changelog b/debian/changelog
index fc4b4bed35..f051484b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ git-annex (5.20140228) UNRELEASED; urgency=medium
   * Probe for quvi version at run time.
   * webapp: Filter out from Switch Repository list any
     repositories listed in autostart file that don't have a
-    git directory anymore.
+    git directory anymore. (Or are bare)
   * webapp: Refuse to start in a bare git repository.
+  * assistant --autostart: Refuse to start in a bare git repository.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 28 Feb 2014 14:52:15 -0400