 ;;; Options
 
 (defgroup ssh-agency ()
-  "Using ssh-agent on `windows-nt'.")
+  "Using ssh-agent on `windows-nt'."
+  :group 'comm)
 
 (defcustom ssh-agency-bin-dir
   (when (eq system-type 'windows-nt)
-    ;; Git for Windows keeps ssh exes in its bin/ directory.
+    ;; Git for Windows 1.x keeps ssh exes in its bin/ directory.
     (-when-let* ((git-exe (executable-find "git.exe"))
                  (git-dir (directory-file-name (file-name-directory git-exe))))
       (if (equal (file-name-nondirectory git-dir) "cmd")

  :group 'ssh-agency
  :type 'directory)

(defcustom ssh-agency-add-executable
  (if ssh-agency-bin-dir
      (expand-file-name "ssh-add.exe" ssh-agency-bin-dir)
    (executable-find "ssh-add"))
  "Location of ssh-add executable."
  :group 'ssh-agency
  :type '(file :must-match t))

(defcustom ssh-agency-agent-executable
  (if ssh-agency-bin-dir
      (expand-file-name "ssh-agent.exe" ssh-agency-bin-dir)
    (executable-find "ssh-agent"))
  "Location of ssh-agent execuable."
  :group 'ssh-agency
  :type '(file :must-match t))

   ;; `start' to get one. Quoting both the executable and the first
   ;; argument breaks Windows' argument parsing, so we use the short
   ;; name for the executable instead of quoting it.
   (concat "start \"ssh-add\" /WAIT " (w32-short-file-name ssh-agency-add-executable)
           ;; When the argument is quoted `ssh-add' doesn't recognize
           ;; file abbreviations like `~', so expand first (also, it's
           ;; possible that Emacs and `ssh-add' will have different
