diff --git a/nova/crypto.py b/nova/crypto.py
index a5126ae8f29e..cd2080c1a108 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -141,7 +141,7 @@ def generate_key_pair(bits=1024):
     with utils.tempdir() as tmpdir:
         keyfile = os.path.join(tmpdir, 'temp')
         utils.execute('ssh-keygen', '-q', '-b', bits, '-N', '',
-                      '-t', 'rsa', '-f', keyfile)
+                      '-t', 'rsa', '-f', keyfile, '-C', 'Generated by Nova')
         fingerprint = _generate_fingerprint('%s.pub' % (keyfile))
         if not os.path.exists(keyfile):
             raise exception.FileNotFound(keyfile)