diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index d071ae3aa3..87232ebeca 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -30,6 +30,7 @@ bundledPrograms = catMaybes
 #endif
 	, Just "rsync"
 	, Just "ssh"
+	, Just "ssh-keygen"
 #ifndef mingw32_HOST_OS
 	, Just "sh"
 #endif
diff --git a/debian/changelog b/debian/changelog
index 904fa5cb8e..a3059560e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ git-annex (5.20131102) UNRELEASED; urgency=low
   * webapp: Improve UI around remote that have no annex.uuid set,
     either because setup of them is incomplete, or because the remote
     git repository is not a git-annex repository.
+  * Include ssh-keygen in standalone bundle.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 02 Nov 2013 14:54:36 -0400
 
diff --git a/doc/bugs/ssh-keygen_failed_when_adding_remote_server_repo.mdwn b/doc/bugs/ssh-keygen_failed_when_adding_remote_server_repo.mdwn
index 671041e671..3aa3188afe 100644
--- a/doc/bugs/ssh-keygen_failed_when_adding_remote_server_repo.mdwn
+++ b/doc/bugs/ssh-keygen_failed_when_adding_remote_server_repo.mdwn
@@ -40,3 +40,5 @@ ssh-keygen: symbol lookup error: /lib64/libldap-2.4.so.2: undefined symbol: ber_
 
 # End of transcript or log.
 """]]
+
+> Added ssh-keygen to bundle. [[fixed|done]] --[[Joey]]