diff --git a/doc/bugs/git_annex_assistant_--stop_fails_if_not_run_from_inside_a_git_annex_repository.mdwn b/doc/bugs/git_annex_assistant_--stop_fails_if_not_run_from_inside_a_git_annex_repository.mdwn
new file mode 100644
index 0000000000..41e921befc
--- /dev/null
+++ b/doc/bugs/git_annex_assistant_--stop_fails_if_not_run_from_inside_a_git_annex_repository.mdwn
@@ -0,0 +1,16 @@
+I set up a systemd unit to start the assistant, which works fine (it uses --autostart). When it comes time to stop the unit, however, it calls git annex assistant --stop, which fails because the current directory doesn't have a git annex repository in it.
+
+    git-annex version: 5.20140717
+    build flags: Assistant Inotify DBus Quvi TDFA
+    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
+    remote types: git gcrypt bup directory rsync web tahoe glacier ddar hook external
+
+Here's my unit file:
+[[!format ini """
+[Service]
+ExecStart=/usr/bin/git-annex assistant --autostart
+ExecStop=/usr/bin/git-annex assistant --stop
+
+[Install]
+WantedBy=default.target
+"""]]