diff --git a/debian/changelog b/debian/changelog
index 379adb2..bc05be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low
     - xt-guess-suite-and-mirror exits with non-zero if no proper mirror
       could be extracted from /etc/apt/sources.list or
       /etc/apt/sources.list.d/*.list (Thanks Phil Frost!)
+  * Add dependency on openssh-client for ssh-keygen (Closes: #649108)
   * No more suggest evms-cli -- it's no more available on any supported
     Dom0 distribution. Thanks to Markus Waldeck for the hint.
   * Bump Standards-Version to 3.9.3 (no changes)
diff --git a/debian/control b/debian/control
index 43aeb06..2733130 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
 
 Package: xen-tools
 Architecture: all
-Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}
+Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}, openssh-client
 Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl
 Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, btrfs-tools
 Description: Tools to manage Xen virtual servers